add

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

@@ -567,8 +567,8 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         if (bw == null){
             return Boolean.TRUE;
         }
-        if (!bw.getAddressSuccess().equals(1)){
-            updateWorkerUploadLag(item,"省市区街道信息有误,请及时维护");
+        if (bw.getAddressSuccess().equals(-1)){
+            updateWorkerUploadLag(item,"省市区街道信息有误,请及时维护【"+dot.getBrandWebsitId()+"】");
             return Boolean.TRUE;
         }
 
@@ -595,7 +595,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
 
         // 写入表备注信息
-        updateWorkerUploadLag(item,"省市区街道信息不存在,请及时维护");
+        updateWorkerUploadLag(item,"省市区街道信息不存在,请及时维护【"+dot.getBrandWebsitId()+"】");
         return Boolean.TRUE;
     }
 
@@ -1428,37 +1428,50 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     private void syncData(String id, String apiPath, OutWorkerUpload item, WorkUploadInfo req,String brandWebsitId) throws Exception {
         GreeResponseHelper response = greeLogic.greePost(apiPath, JSONObject.toJSONString(req), publicService.getCompanyId(brandWebsitId));
 
+        BrandWebsit bw = brandWebsitService.lambdaQuery()
+                .eq(BrandWebsit::getBrandWebsitNumber, brandWebsitId)
+                .last("limit 1").one();
+
         if (response.getStatus() == 200){
             // 成功 修改同步状态
             updateWorkerUploadSuccess(item);
             // 修改师傅品牌网点帐号
             updataWorker(id, response);
+
+            // 修改总部网点的地址正确性标识
+            if (bw !=null && !bw.getAddressSuccess().equals(1)){
+                bw.setAddressSuccess(1);
+                bw.updateById();
+            }
         } else {
             // 失败 修改同步状态
-            updateWorkerUploadError(item, response);
+            updateWorkerUploadError(item, response, brandWebsitId);
+            // 修改总部网点的地址正确性标识
             if (response.getMsg().contains("获取不到乡镇信息")){
-                BrandWebsit bw = brandWebsitService.lambdaQuery()
-                        .eq(BrandWebsit::getBrandWebsitNumber, brandWebsitId)
-                        .last("limit 1").one();
                 if (bw !=null){
-                    bw.setAddressSuccess(0);
+                    bw.setAddressSuccess(-1);
                     bw.updateById();
                 }
             }
         }
     }
 
-    private void updateWorkerUploadError(OutWorkerUpload item, GreeResponseHelper response) {
+    private void updateWorkerUploadError(OutWorkerUpload item, GreeResponseHelper response,String brandWebsitId) {
+        String msg = "["+brandWebsitId+"]";
         OutWorkerUpload v = new OutWorkerUpload();
         v.setSynReqId(item.getSynReqId());
         v.setSyncStatus(99);
         v.setSyncTime(new Date());
         v.setSyncTimes(item.getSyncTimes()+1);
-
-        if (response.getMsg().length()>255){
-            v.setSyncErrorMsg(response.getMsg().substring(0,255));
+        if (StringUtils.isNotEmpty(response.getMsg())){
+            msg = msg + response.getMsg();
+        } else {
+            msg = msg + "网点证件信息同步出错";
+        }
+        if (msg.length()>255){
+            v.setSyncErrorMsg(msg.substring(0,255));
         } else {
-            v.setSyncErrorMsg(response.getMsg());
+            v.setSyncErrorMsg(msg);
         }
 
         outWorkerUploadService.updateById(v);