add

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

@@ -168,7 +168,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     }
 
                     // 获取签约品类
-                    if (getCategory(brand, jySignSplbList, sySignSplbList, worker, item, dot.getWorkerId())){
+                    if (getCategory(brand, jySignSplbList, sySignSplbList, worker, item, dot.getWebsitId())){
                         break;
                     }
 
@@ -186,6 +186,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     if (response.getStatus() == 200){
                         // 获取网点签约的品类信息
                         websitqypl = JSONObject.parseObject(response.getData().toString(), WebsitQXLB.class);
+                        log.info("网点签约的品类信息{}-{}",dot.getBrandWebsitId(),JSONObject.toJSONString(websitqypl));
                     } else {
                         // 写入表备注信息
                         updateWorkerUploadLag(item,"获取网点签约的品类信息失败["+
@@ -194,6 +195,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                         break;
                     }
 
+                    log.info("平台师傅签约的品类信息[{}-{}] 家用:{} 商用：{}",
+                            worker.getWorkerId(),dot.getWebsitId(),
+                            JSONObject.toJSONString(jySignSplbList),JSONObject.toJSONString(sySignSplbList));
+
                     // 从网点签约的品类信息中过滤师傅的品类信息
                     String result = extracted(jySignSplbList, sySignSplbList, jyList, syList, websitqypl,dot.getBrandWebsitId());
                     if (result.length()>0){
@@ -1022,7 +1027,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
      * 签约大类，必须有对应的小类信息，否则无法上传(获取所有的大类对应的小类信息，再从网点本身过滤掉)
      */
     private Boolean getCategory(Brand brand, List<SignSplb> jySignSplbList, List<SignSplb> sySignSplbList,
-                                Worker worker, OutWorkerUpload itemi, String workerId) {
+                                Worker worker, OutWorkerUpload itemi, String websitId) {
         List<String> SYDictDaleiCode = new ArrayList<>();
 
         // 提取品牌商所有的商用大类信息
@@ -1036,7 +1041,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         // 提取师傅的服务大类信息
         List<WorkerServiceCategoryDetail> wxgCategoryRecs = workerServiceCategoryDetailService.lambdaQuery()
                 .eq(WorkerServiceCategoryDetail::getWorkerId, worker.getWorkerId())
-                .eq(WorkerServiceCategoryDetail::getWebsitId, workerId).list();
+                .eq(WorkerServiceCategoryDetail::getWebsitId, websitId).list();
 
         // 组装类别参数
         if (wxgCategoryRecs !=null && wxgCategoryRecs.size()>0){
@@ -1045,7 +1050,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
         if (jySignSplbList.size()<1 && sySignSplbList.size()<1){
             // 写入表备注信息
-            updateWorkerUploadLag(itemi,"师傅签约的品类不能同时为空");
+            updateWorkerUploadLag(itemi,worker.getWorkerId() + "-"+websitId+"平台师傅签约的品类不能同时为空");
             return Boolean.TRUE;
         }