yaozhixue преди 1 година
родител
ревизия
54017eb602

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

@@ -150,7 +150,7 @@ public class GLPPWXGQueryAdd {
 
 
 
-    // 从总部生成平台网点证件数据
+    // 从总部生成平台网点师傅证件数据 方便入驻网点
     @Scheduled(fixedDelayString = "${sfzjxx}")
     public void processsfzj() throws Exception {
         if (sfzjxxc.equals(TaskConfigEnum.FALSE.getCode())){

+ 9 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -287,8 +287,6 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         List<String> WebsitWorkers = new ArrayList<>();
 
         for (ItfTblWangdianWxgDownload m : addRec){
-            m.setWebsitWorkerStatus(1);
-            uprecs.put(m.getSynReqId(),m);
             // 只有存在网点对应关系才可以新增师傅到网点信息中来 存在品牌网点对应平台多网点
             if (!websitOrderSignMap.containsKey(m.getWdno())){
                 continue;
@@ -312,6 +310,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 }
                 upWorkerBrandAccounts.addAll(oldwbas);
                 // 修改平台网点师傅信息 要求存在就不修改只新增
+
+                m.setWebsitWorkerStatus(1);
             } else {
                 // 新增师傅所在品牌、商户网点信息
                 List<WebsitOrderSign> wosrec = new ArrayList<>();
@@ -333,6 +333,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     WorkerBrandAccount add = getWorkerBrandAccount(workerIdCardMap, ptPpWebsitMap, m, addwbas, i);
                     // 主键: worker_id + websit_id  已添加过就不再添加
                     if (WebsitWorkers.contains(add.getWorkerId()+add.getWebsitId())){
+                        m.setWebsitWorkerStatus(1);
                         continue;
                     }
                     WebsitWorkers.add(add.getWorkerId()+add.getWebsitId());
@@ -346,8 +347,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     if (ww == null){
                         getWebsitWorker(workerIdCardMap, ptPpWebsitMap, m, websitWorkeradd, i, add);
                     }
+                    m.setWebsitWorkerStatus(1);
                 }
             }
+
+            if (m.getWebsitWorkerStatus().equals(1)){
+                uprecs.put(m.getSynReqId(),m);
+            }
+
             // 修改品牌商网点师傅数据
             if (upWorkerBrandAccounts.size()>1000){
                 workerBrandAccountService.updateBatchById(upWorkerBrandAccounts);