jiahui 1 rok pred
rodič
commit
64e5a5c87a

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryUpdate.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * 扫描下载表
  */
 @Slf4j
-@Component
+//@Component
 public class GLPPWXGQueryUpdate {
     @Value("${wxgxgc}")
     private String wxgxgc = "";

+ 6 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -703,7 +703,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         for (final ItfTblWangdianWxgDownload wxgDownload :wxgRecs){
             long count = workerBrandAccounts.stream()
-                    .filter(v -> StringUtils.equals(v.getBrandWebsitId(), String.valueOf(wxgDownload.getWxgid()))).count();
+                    .filter(v -> StringUtils.equals(v.getBrandWorkerId(), String.valueOf(wxgDownload.getWxgid()))).count();
             if(count == 0)
                 continue;
 
@@ -2158,7 +2158,11 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 新增
         // 看 worker_service_category 有无数据,无数据新增
         if(wxgCategoryDetails != null && wxgCategoryDetails.containsKey(code)){
-            return;
+            List<WorkerServiceCategoryDetail> workerServiceCategoryDetails = wxgCategoryDetails.get(code);
+            long count = workerServiceCategoryDetails.stream()
+                    .filter(v -> StringUtils.equals(v.getWebsitWorkerId(), workerBrandAccount.getWebsitWorkerId())).count();
+            if(count > 0)
+                return;
         }
 
         //去重,判断是否存在

+ 3 - 3
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryUpdateServiceImpl.java

@@ -240,9 +240,9 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
         }
 
         // 同步-师傅地理位置
-        if (ws.size()>0){
-            workerStreetService.updateBatchById(ws);
-        }
+//        if (ws.size()>0){
+//            workerStreetService.updateBatchById(ws);
+//        }
 
         // 师傅服务类目新增
         if (wscList.size()>0){