add

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorker.java

@@ -99,9 +99,10 @@ public class GLPPGFWebsitWorker {
     }
 
 
-    // 数据同步到本地表(worker:师傅信息表 + worker_brand_account：师傅网点对应品牌网点信息表 + websit_worker:网点师傅信息表)
+    // 数据同步到本地表
+    // (worker(师傅信息表) + worker_brand_account(师傅网点对应品牌网点信息表) + websit_worker(网点师傅信息表))
     // 师傅信息一定新增
-    // 品牌网点与平台网点有对应关系才会同步生成相应的网点数据
+    // 品牌网点与平台网点有对应关系(websit_order_sign)才会同步生成生成平台网点及品牌商网点师傅数据
     @Scheduled(fixedDelayString = "${gfwww}")
     private void processData() {
         if (gfwwwc.equals(TaskConfigEnum.FALSE.getCode())){

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -87,18 +87,18 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         Long endTime = System.currentTimeMillis();
         log.info("同步师傅数据到到本地库结束耗时(毫秒): {}",endTime-startTime);
 
-        // 新增网点师傅 websit_worker+商户网点师傅信息 存在修改，不存在新增
+        // 新增网点师傅 websit_worker(商户网点师傅信息) 存在修改，不存在新增
         addWebsitWorkerBrandAccountsInfo(recs);
         recs.clear();
     }
 
     @Transactional(rollbackFor = Exception.class)
     public void addWebsitWorkerBrandAccountsInfo(List<ItfTblWangdianWxgDownload> addRec) {
-        // 新增网点师傅 websit_worker+商户网点师傅信息 存在修改，不存在新增
+        // 新增网点师傅 websit_worker+(商户网点师傅信息) 存在修改，不存在新增
         Map<String,List<WebsitOrderSign>> websitOrderSignMap = new HashMap<>();
         Map<String, List<Worker>> workerIdCardMap = new HashMap<>();
         List<Websit> websitrec = new ArrayList<>();
-        Map<String,List<Websit>> websitMap = new HashMap<>();
+        Map<String,List<Websit>> ptPpWebsitMap = new HashMap<>();
         List<WorkerBrandAccount> addwbas = new ArrayList<>();
         List<WebsitWorker> websitWorkeradd = new ArrayList<>();
         List<WorkerBrandAccount> upWorkerBrandAccount = new ArrayList<>();
@@ -114,10 +114,10 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         websitrec = websitService.lambdaQuery()
                 .select(Websit::getWebsitId,Websit::getServiceId,Websit::getWebsitName).list();
         if (CollectionUtils.isNotEmpty(websitrec)){
-            websitMap = websitrec.stream().collect(Collectors.groupingBy(Websit::getWebsitId));
+            ptPpWebsitMap = websitrec.stream().collect(Collectors.groupingBy(Websit::getWebsitId));
         }
 
-        // 查看品牌网点与平台网点是否存在对应关系 （存在品牌网点对应平台多网点）
+        // 查看品牌网点与平台网点是否存在对应关系websit_order_sign （存在品牌网点对应平台多网点）
         List<WebsitOrderSign> wos = publicService.SyncshshwdToptshwd();
         if (CollectionUtils.isNotEmpty(wos)){
             websitOrderSignMap = wos.stream().collect(Collectors.groupingBy(WebsitOrderSign::getBrandWebsitId));
@@ -125,7 +125,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
         if (addRec.size()>0){
             // 生成平台网点及品牌商网点师傅数据
-            getWebsitWorkerBrandAccounts(addRec, websitOrderSignMap, workerIdCardMap, websitMap, addwbas,
+            getWebsitWorkerBrandAccounts(addRec, websitOrderSignMap, workerIdCardMap, ptPpWebsitMap, addwbas,
                     websitWorkeradd, upWorkerBrandAccount);
 
             // 修改品牌商网点师傅数据
@@ -235,7 +235,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     private void getWebsitWorkerBrandAccounts(List<ItfTblWangdianWxgDownload> addRec,
                                                                   Map<String, List<WebsitOrderSign>> websitOrderSignMap,
                                                                   Map<String, List<Worker>> workerIdCardMap,
-                                                                  Map<String, List<Websit>> websitMap,
+                                                                  Map<String, List<Websit>> ptPpWebsitMap,
                                                                   List<WorkerBrandAccount> addwbas,
                                                                   List<WebsitWorker> websitWorkeradd,
                                                                   List<WorkerBrandAccount> upWorkerBrandAccounts) {
@@ -278,7 +278,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     }
 
                     // 生成品牌师傅网点信息对像
-                    WorkerBrandAccount add = getWorkerBrandAccount(workerIdCardMap, websitMap, m, addwbas, i);
+                    WorkerBrandAccount add = getWorkerBrandAccount(workerIdCardMap, ptPpWebsitMap, m, addwbas, i);
                     // 主键： worker_id + websit_id  已添加过就不再添加
                     if (WebsitWorkers.contains(add.getWorkerId()+add.getWebsitId())){
                         continue;
@@ -292,7 +292,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                             .one();
 
                     if (ww == null){
-                        getWebsitWorker(workerIdCardMap, websitMap, m, websitWorkeradd, i, add);
+                        getWebsitWorker(workerIdCardMap, ptPpWebsitMap, m, websitWorkeradd, i, add);
                     }
                 }
             }
@@ -333,13 +333,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         return workerId;
     }
 
-    private void getWebsitWorker(Map<String, List<Worker>> workerIdCardMap, Map<String, List<Websit>> websitrecMap,
+    private void getWebsitWorker(Map<String, List<Worker>> workerIdCardMap, Map<String, List<Websit>> ptPpWebsitMap,
                                  ItfTblWangdianWxgDownload m, List<WebsitWorker> websitWorkeradd,
                                  WebsitOrderSign i, WorkerBrandAccount add) {
         WebsitWorker v = new WebsitWorker();
         // 一定要与worker_brand_account.websit_worker_id相同
         v.setWebsitWorkerId(add.getWebsitWorkerId());
-        v.setServiceId(websitrecMap.get(i.getWebsitId()).get(0).getServiceId());
+        v.setServiceId(ptPpWebsitMap.get(i.getWebsitId()).get(0).getServiceId());
         v.setWebsitId(add.getWebsitId());
         v.setWorkerId(add.getWorkerId());
         v.setCreateBy("system");
@@ -449,7 +449,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
 
     @NotNull
     private WorkerBrandAccount getWorkerBrandAccount(Map<String, List<Worker>> workerIdCardMap,
-                                                     Map<String, List<Websit>> websitrecMap,
+                                                     Map<String, List<Websit>> ptPpWebsitMap,
                                                      ItfTblWangdianWxgDownload m,
                                                      List<WorkerBrandAccount> addwbas, WebsitOrderSign i) {
         WorkerBrandAccount add = new WorkerBrandAccount();
@@ -468,7 +468,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         add.setGroupCompanyName(i.getGroupCompanyName());
         add.setWebsitId(i.getWebsitId());
         // 网点名称
-        add.setWebsitName(websitrecMap.get(i.getWebsitId()).get(0).getWebsitName());
+        add.setWebsitName(ptPpWebsitMap.get(i.getWebsitId()).get(0).getWebsitName());
         add.setBrandWebsitId(i.getBrandWebsitId());
         add.setBrandWebsitName(i.getBrandWebsitName());
         add.setBrandWorkerId(String.valueOf(m.getWxgid()));