Merge branch 'master' of http://124.220.229.80:9093/root/cif

cif-service/src/main/java/com/txz/cif/dubbo/client/OrderDubboServiceClient.java

@@ -23,7 +23,7 @@ public class OrderDubboServiceClient {
         log.info("cif:scheduledTaskStorePinkSummaryClose end");
     }
 
-    ;
+
 
     /**
      * 自动签收定时任务
@@ -34,7 +34,7 @@ public class OrderDubboServiceClient {
         log.info("cif:scheduledTaskBatchSigning end");
     }
 
-    ;
+
 
 
     public void orderTimeoutAutomaticCancel() {
@@ -43,6 +43,14 @@ public class OrderDubboServiceClient {
         log.info("cif:orderTimeoutAutomaticCancel end");
     }
 
-    ;
+
+
+
+    public void activityStatusJudgmentTimedTask() {
+        log.info("cif:activityStatusJudgmentTimedTask start");
+        orderDubboService.activityStatusJudgmentTimedTask();
+        log.info("cif:activityStatusJudgmentTimedTask end");
+    }
+
 
 }

cif-service/src/main/java/com/txz/cif/task/GeneralJob.java

@@ -156,7 +156,21 @@ public class GeneralJob {
         }
         return ReturnT.SUCCESS;
     }
-    
+
+    @XxlJob("activityStatusJudgmentTimedTask")
+    public ReturnT<String> activityStatusJudgmentTimedTask(String param) throws Exception {
+        try {
+            logger.info("【活动定时改变状态任务】开始");
+            orderDubboServiceClient.activityStatusJudgmentTimedTask();
+            logger.info("【活动定时改变状态任务】完成");
+        } catch (Exception e) {
+            logger.error("【活动定时改变状态任务】异常：e{}", e);
+            return ReturnT.FAIL;
+        }
+        return ReturnT.SUCCESS;
+    }
+
+
     @XxlJob("closeRecharge")
     public ReturnT<String> closeRecharge() throws Exception {
         try {

cif-service/src/main/java/com/txz/cif/web/bo/UserBo2.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -18,58 +19,63 @@ public class UserBo2 {
     /**
      * 用户id
      */
-    @ApiModelProperty(value="用户id")
+    @ApiModelProperty(value = "用户id")
     private Long id;
-
+    
+    /**
+     * 用户号
+     */
+    private String userNo;
+    
     @ApiModelProperty("名称")
     private String nickname;
-
+    
     @ApiModelProperty("名称")
     private String name;
-
+    
     @ApiModelProperty("头像")
     private String headPic;
-
-    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    
+    @ApiModelProperty(value = "状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
-
+    
     private String phoneNo;
-
+    
     /**
      * token
      */
-    @ApiModelProperty(value="vip")
+    @ApiModelProperty(value = "vip")
     private Integer vipLevel;
-
-    @ApiModelProperty(value="备注")
+    
+    @ApiModelProperty(value = "备注")
     private String memo;
-
-    @ApiModelProperty(value="邀请好友数")
+    
+    @ApiModelProperty(value = "邀请好友数")
     private Integer inviteNum;
-
-    @ApiModelProperty(value="团队人数")
+    
+    @ApiModelProperty(value = "团队人数")
     private Integer teamNum;
-
-
-    @ApiModelProperty(value="成团数")
+    
+    
+    @ApiModelProperty(value = "成团数")
     private Integer successGroupNum;
-
-    @ApiModelProperty(value="钱包余额")
+    
+    @ApiModelProperty(value = "钱包余额")
     private BigDecimal walletBalance;
-
-    @ApiModelProperty(value="收益余额")
+    
+    @ApiModelProperty(value = "收益余额")
     private BigDecimal earningsBalance;
-
-    @ApiModelProperty(value="createTime创建时间")
+    
+    @ApiModelProperty(value = "createTime创建时间")
     private Date createTime;
-
-    @ApiModelProperty(value="是否有提现权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有提现权限 1是 2否")
     private Integer hasWithdraw;
-
-    @ApiModelProperty(value="是否有登录权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有登录权限 1是 2否")
     private Integer hasLogin;
-
-    @ApiModelProperty(value="是否有下单权限 1是 2否")
+    
+    @ApiModelProperty(value = "是否有下单权限 1是 2否")
     private Integer hasOrder;
-
+    
 }

cif-service/src/main/java/com/txz/cif/web/mng/OrderApiController.java

@@ -46,4 +46,14 @@ public class OrderApiController {
         return ResultGenerator.genSuccessResult();
     }
 
+
+    @PostMapping("/activityStatusJudgmentTimedTask")
+    @ApiOperation(value = "活动状态修改定时任务",httpMethod = "POST")
+    public Result activityStatusJudgmentTimedTask() {
+        orderDubboServiceClient.activityStatusJudgmentTimedTask();
+        return ResultGenerator.genSuccessResult();
+    }
+
+
+
 }