add

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

@@ -119,6 +119,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             addWebsitWorkerBrandAccountsInfo(recs, uprecs);
         }
 
+        // 测试用
+        /*recs = itfTblWangdianWxgDownloadService.lambdaQuery()
+                .in(ItfTblWangdianWxgDownload::getSfzen,"431003199803271316").list();
+        // 新增网点师傅 websit_worker(商户网点师傅信息) 存在修改，不存在新增
+        // 只做新增，不做修改动作
+        addWebsitWorkerBrandAccountsInfo(recs, uprecs);*/
+
+
 
         // 同步无效的数据
         if (CollectionUtils.isNotEmpty(recouts)){
@@ -230,6 +238,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 .select(Worker::getIdcard,Worker::getWorkerId,Worker::getWorkerName,Worker::getMobile).list();
         if (CollectionUtils.isNotEmpty(oldWorkerRec)){
             workerIdCardMap = oldWorkerRec.stream().collect(Collectors.groupingBy(Worker::getIdcard));
+            oldWorkerRec.clear();
         }
 
         // 平台服务商网点信息
@@ -237,12 +246,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 .select(Websit::getWebsitId,Websit::getServiceId,Websit::getWebsitName).list();
         if (CollectionUtils.isNotEmpty(websitrec)){
             ptPpWebsitMap = websitrec.stream().collect(Collectors.groupingBy(Websit::getWebsitId));
+            websitrec.clear();
         }
 
         // 查看品牌网点与平台网点是否存在对应关系websit_order_sign （存在品牌网点对应平台多网点）
         List<WebsitOrderSign> wos = publicService.SyncshshwdToptshwd();
         if (CollectionUtils.isNotEmpty(wos)){
             websitOrderSignMap = wos.stream().collect(Collectors.groupingBy(WebsitOrderSign::getBrandWebsitId));
+            wos.clear();
         }
 
         if (addRec.size()>0){
@@ -297,7 +308,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                     .eq(WorkerBrandAccount::getBrandWebsitId,m.getWdno())
                     .eq(WorkerBrandAccount::getBrandWorkerId,m.getWxgid()).list();
 
-            // 存在只修改师傅帐号状态
+            // 存在只修改师傅帐号状态 + 网点编号因为平台会删除
             if (CollectionUtils.isNotEmpty(oldwbas)){
                 for (WorkerBrandAccount wba : oldwbas){
                     // 修改网点师傅信息
@@ -307,11 +318,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                             wba.setBrandWorkerStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
                         }
                     }
+                    // 网点编号
+                    if (StringUtils.isEmpty(wba.getBrandWorkerNumber())){
+                        wba.setBrandWorkerNumber(m.getWxgno());
+                    }
                     wba.setOutSyncTime(new Date());
                 }
                 upWorkerBrandAccounts.addAll(oldwbas);
                 // 修改平台网点师傅信息 要求存在就不修改只新增
-
                 m.setWebsitWorkerStatus(1);
             } else {
                 // 新增师傅所在品牌、商户网点信息

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

@@ -397,7 +397,6 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                 }
 
                 // 按网点同步
-
                 for (WorkerBrandAccount dot: workerBrandAccount){
                     // 找出指定网点 三方网点与平台网点
                     if (!(dot.getBrandWebsitId().equals(item.getBrandWebsitId()) &&
@@ -1461,7 +1460,12 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
         req.setCsgzns(worker.getJobAge());
         // 必填
-        req.setDizhi(worker.getAddress());
+        if (StringUtils.isNotEmpty(worker.getAddress())){
+            req.setDizhi(worker.getAddress());
+        } else {
+            req.setDizhi(req.getSfen() + req.getCshi() + req.getCounty() + req.getXzhen());
+        }
+
         req.setFacecheck(wb.getFaceCheck());
         req.setFacepath("");
         if (StringUtils.isNotEmpty(wb.getFacePath())){

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -29,6 +29,11 @@ import java.util.Date;
 public class UploadWorkerTOGree {
     @Value("${workerceruploadc}")
     private String workerceruploadc = "";
+    @Value("${workerrzc}")
+    private String workerrzc = "";
+
+
+
 
     @Autowired
     UploadWorkerTOGreeService uploadWorkerTOGreeService;
@@ -75,7 +80,7 @@ public class UploadWorkerTOGree {
     @Scheduled(fixedDelayString = "${workercerupload}")
     public void workAddProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (workerceruploadc.equals(TaskConfigEnum.FALSE.getCode())){
+        if (workerrzc.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 

src/main/resources/bootstrap-dev.properties

@@ -308,6 +308,7 @@ workercertificatec=FALSE
 workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
+workerrzc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -299,6 +299,7 @@ workercertificatec=TRUE
 workerceruploadc=TRUE
 detaildownc=TRUE
 workercertbxc=TRUE
+workerrzc=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=TRUE
 recyclefkdownc=TRUE

src/main/resources/bootstrap-prdt.properties

@@ -296,9 +296,10 @@ SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=TRUE
+workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
+workerrzc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -328,7 +329,7 @@ fsxwxgc=FALSE
 fsswxgc=FALSE
 gzxwxgc=FALSE
 gzswxgc=FALSE
-gfwwwc=FALSE
+gfwwwc=TRUE
 #类别大类、小类、系列、机型
 lbdlc=FALSE
 lbxlc=FALSE

src/main/resources/bootstrap-test.properties

@@ -307,6 +307,7 @@ workercertificatec=TRUE
 workerceruploadc=TRUE
 detaildownc=TRUE
 workercertbxc=TRUE
+workerrzc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=TRUE
 recyclefkdownc=TRUE