yaozhixue 1 éve
szülő
commit
afed832c56

+ 14 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -584,6 +584,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void updateWorkerCertInfo(List<WorkerCert> workerCertUpList, int i) {
         if (workerCertUpList.size() > i) {
+            for (WorkerCert x:workerCertUpList){
+                if (x.getId().length()==19){
+                    log.info("证件图师傅ID出错 B: {}",x.getWorkerId());
+                }
+            }
+
             workerCertService.updateBatchById(workerCertUpList);
             workerCertUpList.clear();
         }
@@ -1067,6 +1073,14 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     public void addDataCert(List<WorkerCert> addList) {
         // 证件同步
         if (addList.size()>0){
+            for (WorkerCert i:addList){
+                if (i.getId().length()==19){
+                    log.info("证件图师傅ID出错 {}",i.getWorkerId());
+                }
+            }
+
+
+
             workerCertService.saveOrUpdateBatch(addList);
             addList.clear();
         }

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

@@ -67,8 +67,6 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
     @Override
     public void extractedQueryUpdate() throws Exception {
         WangdianWxgVos wvos = new WangdianWxgVos();
-        List<WorkerCert> updateList = new ArrayList<>();
-        List<WorkerCert> addList = new ArrayList<>();
         List<WorkerBrandAccount> wbarecs = new ArrayList<>();
         Map<String,Object> req = new HashMap<>();
         List<WorkerServiceCategory> wscList = new ArrayList<>();
@@ -158,7 +156,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs, sysDictRefMap, workerBrandAccount);
 
                     // 新增或修改(证件,师傅地理位置,师傅服务的类目)
-                    addOrUpdate(updateList, addList, wscList, wscdList, ws);
+                    addOrUpdate(wscList, wscdList, ws);
                 } catch (Exception ex) {
                     log.info("工程师信息同步失败:{}", ex);
                 }
@@ -200,44 +198,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void addData(List<WorkerBrandAccount> wbaaddList,List<WorkerCert> updateList, List<WorkerCert> addList,
-                        List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
-                        List<WorkerStreet> ws) {
-        // 师傅所在品牌商网点信息同步
-        if (wbaaddList.size()>0){
-            workerBrandAccountService.saveBatch(wbaaddList);
-        }
-        // 证件同步
-        if (updateList.size()>0){
-            workerCertService.saveBatch(updateList);
-        }
-        if (addList.size()>0){
-            workerCertService.saveBatch(addList);
-        }
-
-        // 同步-师傅地理位置
-        if (ws.size()>0){
-            workerStreetService.saveBatch(ws);
-        }
-
-        // 师傅服务类目新增
-        if (wscList.size()>0){
-            workerServiceCategoryService.saveBatch(wscList);
-        }
-        if (wscdList.size()>0){
-            workerServiceCategoryDetailService.saveBatch(wscdList);
-        }
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void addOrUpdate(List<WorkerCert> updateList, List<WorkerCert> addList, List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, List<WorkerStreet> ws) {
-        // 证件同步
-        if (updateList.size()>0){
-            workerCertService.saveBatch(updateList);
-        }
-        if (addList.size()>0){
-            workerCertService.saveBatch(addList);
-        }
+    public void addOrUpdate(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, List<WorkerStreet> ws) {
 
         // 同步-师傅地理位置
 //        if (ws.size()>0){
@@ -252,8 +213,6 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
             workerServiceCategoryDetailService.saveBatch(wscdList);
         }
 
-        updateList.clear();
-        addList.clear();
         ws.clear();
         wscList.clear();
         wscdList.clear();