add

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

@@ -441,7 +441,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
-            wxgCategoryQueryAdd(wxgDownload,workerBrandAccounts,workerServiceCategoryDetailMap,sysDict,sysDictRefMap, workerServiceCategoryDetailList);
+            wxgCategoryQueryAdd(wxgDownload,workerBrandAccounts,workerServiceCategoryDetailMap,sysDict,
+                    sysDictRefMap, workerServiceCategoryDetailList);
         }
     }
 
@@ -1336,6 +1337,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         List<WorkerServiceCategoryDetail> wscdList = new ArrayList<>();
 
         for (WorkerBrandAccount i:workerBrandAccounts){
+            log.info("已有的服务类目 {}",JSONObject.toJSONString(workerServiceCategoryDetailMap));
+            log.info("本次新增的服务类目 {}",JSONObject.toJSONString(workerServiceCategoryDetailList));
+
+
+
+
             // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
             WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(workerBrandAccounts, wxgDownload);
             if (workerBrandAccount == null){
@@ -1352,11 +1359,17 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
+            log.info("师傅信息 {}",JSONObject.toJSONString(i));
+
+
             // 参数 获取网点维修工信息
             getParameter(wxgDownload.getWdno(), wxgDownload.getWxgno(), req);
             try {
                 // 格力总部查询工程师信息
                 GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.getWdno()));
+
+                log.info("师傅信息查询结果 {}",JSONObject.toJSONString(response));
+
                 if (response.getStatus() == 200){
                     WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
                     // 无信息不处理
@@ -1385,11 +1398,14 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxgDownload, wxgCategoryTypeRecs,
                             sysDictRefMap, workerBrandAccount, workerServiceCategoryDetailList);
 
+                    log.info("师傅服务类目 {}",JSONObject.toJSONString(wscList));
+                    log.info("师傅服务类别 {}",JSONObject.toJSONString(wscdList));
+
                     // 新增或修改(师傅服务的类目)
                     addDataCategory(wscList, wscdList);
 
                     // 清理缓存，把新增的服务类目加到缓存中
-                    extractedCaretory(wscList, wscdList, workerServiceCategoryDetailMap, wxgDownload);
+                    extractedCaretory(wscList, wscdList, workerServiceCategoryDetailMap, workerBrandAccount);
                 }  else {
                     log.info("工程师信息同步失败:{}", JSONObject.toJSONString(req));
                     log.info("msg:{}", response.getMsg());
@@ -1402,9 +1418,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     }
 
     private void extractedCaretory(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                                   Map<String, List<WorkerServiceCategoryDetail>> oldWxgCategoryRecMap, ItfTblWangdianWxgDownload wxg) {
-        if (oldWxgCategoryRecMap.containsKey(wxg.getSfzen())){
-            oldWxgCategoryRecMap.get(wxg.getSfzen()).addAll(wscdList);
+                                   Map<String, List<WorkerServiceCategoryDetail>> oldWxgCategoryRecMap, WorkerBrandAccount workerBrandAccount) {
+        if (!oldWxgCategoryRecMap.containsKey(workerBrandAccount.getWebsitWorkerId())){
+            oldWxgCategoryRecMap.put(workerBrandAccount.getWebsitWorkerId(),wscdList);
         }
 
         wscList.clear();