no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/MyDataCountBean.java

@@ -34,6 +34,9 @@ public class MyDataCountBean {
     @ApiModelProperty(value = "已返还")
     private Integer endRefundCount;
 
+    @ApiModelProperty(value = "已提交")
+    private Integer saveCount;
+
     @ApiModelProperty(value = "待支付")
     private Integer waitPayCount;
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -178,6 +178,10 @@ public class WebsitSalesLogic {
                 .eq(WebsitSales::getWorkerId, wechat.getUserId())
                 .eq(WebsitSales::getFlag, "PAY_TAKE")
                 .count());
+        bean.setSaveCount(websitSalesService.lambdaQuery()
+                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getFlag, "SAVE")
+                .count());
 
         return bean;
     }

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/User2VO.java

@@ -24,6 +24,10 @@ public class User2VO {
     @ApiModelProperty("商户名称")
     private String companyName;
 
+    @ZfireField(tbName = "b")
+    @ApiModelProperty("师傅编号")
+    private String workerNumber;
+
     @ApiModelProperty("用户昵称")
     private String nickName;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/member/UserApplyBean.java

@@ -19,6 +19,8 @@ import java.util.List;
 public class UserApplyBean {
     @ApiModelProperty("用户id")
     private String userId;
+    @ApiModelProperty("师傅编号")
+    private String workerNumber;
     @ApiModelProperty("师傅名称")
     private String name;
     @ApiModelProperty("类型 SERVICE=分销员 WORKER=师傅")

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -185,7 +185,6 @@ public class MemberController {
 //            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
 //            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
     ) {
-        //userLogic.
         userLogic.updateWorker(bean.getUserId(), bean.getWebsitId(), bean.getNickName(), bean.getIdCard(), bean.getIdCardImg(),
                 bean.getBankAccount(), bean.getIsEs(), bean.getWorkerNumber());
         userLogic.examine(bean.getId(), bean.getExamineStatus(), bean.getExamineRemark());

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -241,7 +241,7 @@ public class UserLogic {
                 //入驻已存在的师傅到网点
                 User worker = userService.lambdaQuery().eq(User::getMobile, mobile).eq(User::getType, UserTypeEnum.WORKER.getKey()).last("limit 1").one();
                 if (worker != null) {
-                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, "系统导入初始化");
+                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
                 }
             }
             userWait.setName(name);
@@ -406,7 +406,7 @@ public class UserLogic {
         if (StringUtils.isNotBlank(websitId)) {
 
             User user = userService.getById(userId);
-            this.saveWebsitUser(websitId, user, userApplyBean.getBankAccount(), "系统手动设置");
+            this.saveWebsitUser(websitId, user, userApplyBean.getBankAccount(), userApplyBean.getWorkerNumber(), "系统手动设置");
         }
 
         userService.lambdaUpdate()
@@ -435,7 +435,7 @@ public class UserLogic {
     }
 
     @Transactional
-    public void saveWebsitUser(String websitId, User user, String bankAccount, String remark) {
+    public void saveWebsitUser(String websitId, User user, String bankAccount, String workerNumber, String remark) {
         websitUserService.lambdaUpdate().eq(WebsitUser::getUserId, user.getUserId()).eq(WebsitUser::getWebsitId, websitId).remove();
         WebsitUser websitUser = new WebsitUser();
         websitUser.setWebsitId(websitId);
@@ -445,6 +445,7 @@ public class UserLogic {
         websitUser.setExamineStatus(ExamineStatusEnum.OK.toString());
         websitUser.setExamineRemark(remark);
         websitUser.setBankAccount(bankAccount);
+        websitUser.setWorkerNumber(workerNumber);
         websitUser.insert();
     }