需求

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

@@ -104,6 +104,9 @@ public class UserLogic {
 
     @Autowired
     UserLogService userLogService;
+
+    @Autowired
+    PgOrderWorkerService pgOrderWorkerService;
     /**
      * 微信小程序授权
      *

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

@@ -32,6 +32,7 @@ import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.RedisUtil;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -83,6 +84,8 @@ public class UserLogic {
     private final PromotionGroupLogic promotionGroupLogic;
     private final CommonLogic commonLogic;
     private final AdminCompanyWechatService adminCompanyWechatService;
+    private final PgOrderBaseService pgOrderBaseService;
+    private final PgOrderWorkerService pgOrderWorkerService;
     private final SettleDailyBankAccountService settleDailyBankAccountService;
 
 
@@ -179,6 +182,17 @@ public class UserLogic {
         user.setBankAccount(bankAccount);
         user.setIsEs(isEs);
         user.updateById();
+
+        pgOrderWorkerService.lambdaUpdate().eq(PgOrderWorker::getWorkerNumber,workerNumber)
+                .set(PgOrderWorker::getWorkerId,user.getUserId())
+                .set(!StringUtil.isEmpty(user.getMobile()),PgOrderWorker::getWorkerMobile,user.getMobile())
+                .update();
+
+        pgOrderBaseService.lambdaUpdate()
+                .eq(PgOrderBase::getWorkerNumber,workerNumber)
+                .set(PgOrderBase::getWorkerId,user.getUserId())
+                .set(!StringUtil.isEmpty(user.getMobile()),PgOrderBase::getWorkerMobile,user.getMobile())
+                .update();
     }
 
     /**

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -821,6 +821,10 @@ public class OrderBaseExcelLogic {
         Map<String, WebsitUser> websitUserMap = websitUsers.stream()
                 .collect(Collectors.toMap(WebsitUser::getWorkerNumber, v -> v));
 
+        List<User> users = userService.lambdaQuery().eq(User::getType,"WORKER").list();
+        Map<String, User> userMap = users.stream()
+                .collect(Collectors.toMap(User::getUserId, v -> v));
+
         //工单渠道
        // Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
         //网点名称
@@ -1058,9 +1062,6 @@ public class OrderBaseExcelLogic {
 
                     pgOrderBase.setWorkerNumber(workerId);
                     pgOrderBase.setWorkerName(workerName);
-                    if (websitUser != null){
-                        pgOrderBase.setWorkerId(websitUser.getUserId());
-                    }
 
                     pgOrderBase.setWorkerReceTime(new Date());
                     pgOrderBase.setDispatchTime(new Date());
@@ -1075,7 +1076,20 @@ public class OrderBaseExcelLogic {
 
                     if (websitUser != null){
                         pgOrderWorker.setWorkerId(websitUser.getUserId());
+                        pgOrderBase.setWorkerId(websitUser.getUserId());
+
+                        User user = userMap.get(websitUser.getUserId());
+
+                        if (!StringUtil.isEmpty(user.getMobile())) {
+                            pgOrderBase.setWorkerNumber(user.getMobile());
+                            pgOrderWorker.setWorkerMobile(user.getMobile());
+                        }
+
                     }
+
+
+
+
                     pgOrderWorker.setIsMaster(true);
                     pgOrderWorkers.add(pgOrderWorker);