需求

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

@@ -817,6 +817,10 @@ public class OrderBaseExcelLogic {
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
         Map<String, GoodsCategory> categoryMap2 = goodsCategoryList.stream().filter(v -> v.getLevel() == 2)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().groupBy(WebsitUser::getWorkerNumber).list();
+        Map<String, WebsitUser> websitUserMap = websitUsers.stream()
+                .collect(Collectors.toMap(WebsitUser::getWorkerNumber, v -> v));
+
         //工单渠道
        // Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
         //网点名称
@@ -1049,9 +1053,15 @@ public class OrderBaseExcelLogic {
 
                 if (StringUtils.isNotBlank(workerId)) {
 
+                    WebsitUser websitUser = websitUserMap.get(workerId+);
+
 
                     pgOrderBase.setWorkerNumber(workerId);
                     pgOrderBase.setWorkerName(workerName);
+                    if (websitUser != null){
+                        pgOrderBase.setWorkerId(websitUser.getUserId());
+                    }
+
                     pgOrderBase.setWorkerReceTime(new Date());
                     pgOrderBase.setDispatchTime(new Date());
 
@@ -1062,12 +1072,18 @@ public class OrderBaseExcelLogic {
                     pgOrderWorker.setWebsitId(pgOrderBase.getWebsitId());
                     pgOrderWorker.setWebsitName(pgOrderBase.getWebsitName());
                     pgOrderWorker.setWorkerName(workerName);
+
+                    if (websitUser != null){
+                        pgOrderWorker.setWorkerId(websitUser.getUserId());
+                    }
                     pgOrderWorker.setIsMaster(true);
                     pgOrderWorkers.add(pgOrderWorker);
 
                 }
             }
 
+
+
             if (Convert.toInt(totalNum) > 0) {
 
                 GoodsCategory mainGoodsCategory = categoryMap1.get(categoryType);