Merge branch '_fcy' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -696,6 +696,7 @@ public class WorkerLogic {
                 confirmManual.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId())
                         .setBelongCompanyCode(code)
                         .setBelongCompanyName(companyName)
+                        .setUserId(user.getUserId())
                         .setWorkerNumber(user.getWorkerNumber())
                         .setNickName(user.getNickName())
                         .setMobile(user.getMobile())
@@ -719,6 +720,7 @@ public class WorkerLogic {
         confirm.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId())
                 .setBelongCompanyCode(code)
                 .setBelongCompanyName(companyName)
+                .setUserId(user.getUserId())
                 .setWorkerNumber(user.getWorkerNumber())
                 .setName(type.equals("gz") ? "广州嘉讯茂辅材费用确认书" : "佛山嘉讯茂辅材费用确认书")
                 .setUrl(commonFile.getUrl())
@@ -739,7 +741,7 @@ public class WorkerLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         return workerSignConfirmService.lambdaQuery()
                 .eq(WorkerSignConfirm::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
-                .eq(WorkerSignConfirm::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerSignConfirm::getUserId, currentCompanyWechat.getUser().getUserId())
                 .list();
     }
 
@@ -749,7 +751,7 @@ public class WorkerLogic {
         Integer count = workerSignConfirmManualService.lambdaQuery()
                 .eq(WorkerSignConfirmManual::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(WorkerSignConfirmManual::getBelongCompanyCode, code)
-                .eq(WorkerSignConfirmManual::getWorkerNumber, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerSignConfirmManual::getUserId, currentCompanyWechat.getUser().getUserId())
                 .eq(WorkerSignConfirmManual::getStatus, ExamineStatusEnum.WAIT.getKey())
                 .count();
         if (count > 0) {

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1031,7 +1031,7 @@ public class UserLogic {
                 if (CollectionUtil.isNotEmpty(adminWebsitList)) {
                     final List<WorkerSignConfirm> signConfirms = workerSignConfirmService.lambdaQuery()
                             .eq(WorkerSignConfirm::getCompanyWechatId, user.getCompanyWechatId())
-                            .eq(WorkerSignConfirm::getWorkerNumber, user.getWorkerNumber())
+                            .eq(WorkerSignConfirm::getUserId, user.getUserId())
                             .list();
                     Map<String, WorkerSignConfirm> confirmMap = new HashMap<>();
                     if (CollectionUtil.isNotEmpty(signConfirms)) {

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WorkerElecConfirmManualVO.java

@@ -22,6 +22,10 @@ public class WorkerElecConfirmManualVO {
     @ApiModelProperty(value = "所属公司")
     private String belongCompanyName;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
     @ApiModelProperty(value = "师傅编号")
     private String workerNumber;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WorkerElecConfirmVO.java

@@ -19,6 +19,10 @@ public class WorkerElecConfirmVO {
     @ApiModelProperty(value = "所属公司编号")
     private String belongCompanyCode;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
     @ApiModelProperty(value = "师傅编号")
     private String workerNumber;
 

mall-server-api/src/main/java/com/gree/mall/manager/controller/worker/WorkerElecConfirmController.java

@@ -58,10 +58,10 @@ public class WorkerElecConfirmController {
     @PostMapping("/detail")
     @ApiOperation("详情")
     public ResponseHelper<WorkerElecConfirmVO> detail(
-            @ApiParam(value = "师傅编号", required = true) @RequestParam String workerNumber,
+            @ApiParam(value = "用户id", required = true) @RequestParam String userId,
             @ApiParam(value = "公司编号", required = true) @RequestParam String belongCompanyCode
     ) throws RemoteServiceException {
-        WorkerElecConfirmVO detail = workerElecConfirmLogic.detail(workerNumber, belongCompanyCode);
+        WorkerElecConfirmVO detail = workerElecConfirmLogic.detail(userId, belongCompanyCode);
         return ResponseHelper.success(detail);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerElecConfirmLogic.java

@@ -7,6 +7,7 @@ import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.worker.WorkerElecConfirmManualVO;
 import com.gree.mall.manager.bean.worker.WorkerElecConfirmVO;
 import com.gree.mall.manager.commonmapper.CommonMapper;
+import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.WorkerElecSingConfirmEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -59,7 +60,7 @@ public class WorkerElecConfirmLogic {
 
     }
 
-    public WorkerElecConfirmVO detail(String workerNumber, String belongCompanyCode) {
+    public WorkerElecConfirmVO detail(String userId, String belongCompanyCode) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WorkerElecConfirmVO vo = new WorkerElecConfirmVO();
         final SysDictCompany company = sysDictCompanyService.lambdaQuery()
@@ -69,7 +70,7 @@ public class WorkerElecConfirmLogic {
                 .one();
         final User user = userService.lambdaQuery()
 //                .eq(User::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
-                .eq(User::getWorkerNumber, workerNumber)
+                .eq(User::getUserId, userId)
                 .one();
         vo.setBelongCompany(company.getDictValue());
         vo.setBelongCompanyCode(belongCompanyCode);
@@ -79,7 +80,7 @@ public class WorkerElecConfirmLogic {
 
         final WorkerSignConfirm confirm = workerSignConfirmService.lambdaQuery()
 //                .eq(WorkerSignConfirm::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
-                .eq(WorkerSignConfirm::getWorkerNumber, workerNumber)
+                .eq(WorkerSignConfirm::getUserId, userId)
                 .eq(WorkerSignConfirm::getBelongCompanyCode, belongCompanyCode)
                 .one();
         vo.setStatus(Objects.isNull(confirm) ? WorkerElecSingConfirmEnum.NO : WorkerElecSingConfirmEnum.YES);
@@ -92,9 +93,6 @@ public class WorkerElecConfirmLogic {
         return commonMapper.workerSignConfirmCount();
     }
 
-    // 师傅签确认书次数
-    public final static String WORKER_SIGN_CONFIRM = "jsm:sxb:lock:worker:sign:confirm:";
-
     public IPage<WorkerElecConfirmManualVO> manualList(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.materialParam(zfireParamBean, WorkerElecConfirmManualVO.class, adminUser);
@@ -132,14 +130,14 @@ public class WorkerElecConfirmLogic {
             confirm.setCompanyWechatId(manual.getCompanyWechatId())
                     .setBelongCompanyCode(manual.getBelongCompanyCode())
                     .setBelongCompanyName(manual.getBelongCompanyName())
+                    .setUserId(manual.getUserId())
                     .setWorkerNumber(manual.getWorkerNumber())
                     .setName(manual.getName())
                     .setUrl(manual.getUrl())
                     .insert();
         }
 
-
-        redisUtil.del(WORKER_SIGN_CONFIRM + manual.getWorkerNumber());
+        redisUtil.del(Constant.RedisPrefix.WORKER_SIGN_CONFIRM + manual.getWorkerNumber());
     }
 
     public Integer manualCount() {