add

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

@@ -235,7 +235,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     req.setWdno(dot.getBrandWebsitId());
 
                     // 日志
-                    log.info("报文：{}",JSONObject.toJSONString(req));
+                    log.info("创建或修改师傅信息request：{}",JSONObject.toJSONString(req));
 
                     // 同步
                     syncData(dot.getId(), wxgaddapi, item, req,dot.getBrandWebsitId());
@@ -267,37 +267,43 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                 req.setCshi(ps.getCity());
                 req.setCounty(ps.getArea());
                 req.setXzhen(ps.getStreet());
-            } else {
-                // 使用商户网点的位置
-                BrandWebsit bw = brandWebsitService.lambdaQuery()
-                        .eq(BrandWebsit::getBrandWebsitNumber, dot.getBrandWebsitId())
-                        .last("limit 1").one();
-                if (bw !=null && StringUtils.isNotEmpty(bw.getSfen()) &&
-                        StringUtils.isNotEmpty(bw.getCshi()) &&
-                        StringUtils.isNotEmpty(bw.getXian()) &&
-                        StringUtils.isNotEmpty(bw.getXzhen())){
-                    req.setSfen(bw.getSfen());
-                    req.setCshi(bw.getCshi());
-                    req.setCounty(bw.getXian());
-                    req.setXzhen(bw.getXzhen());
-                } else {
-                    if (bw !=null){
-                        Geographicallocation gs = publicService.getRegionByAddress(String.valueOf(bw.getJingdu()),String.valueOf(bw.getWeidu()));
-                        if (gs != null){
-                            req.setSfen(gs.getProvince());
-                            req.setCshi(gs.getCity());
-                            req.setCounty(gs.getArea());
-                            req.setXzhen(gs.getStreet());
-                        }
-                    } else {
-                        // 写入表备注信息
-                        updateWorkerUploadLag(item,"师傅服务区域信息不存在");
-                        return true;
-                    }
-                }
+                return Boolean.FALSE;
             }
         }
-        return false;
+
+        // 使用商户网点的位置
+        BrandWebsit bw = brandWebsitService.lambdaQuery()
+                .eq(BrandWebsit::getBrandWebsitNumber, dot.getBrandWebsitId())
+                .last("limit 1").one();
+        if (bw ==null){
+            return Boolean.TRUE;
+        }
+
+        if (StringUtils.isNotEmpty(bw.getSfen()) &&
+                StringUtils.isNotEmpty(bw.getCshi()) &&
+                StringUtils.isNotEmpty(bw.getXian()) &&
+                StringUtils.isNotEmpty(bw.getXzhen())){
+            req.setSfen(bw.getSfen());
+            req.setCshi(bw.getCshi());
+            req.setCounty(bw.getXian());
+            req.setXzhen(bw.getXzhen());
+            return Boolean.FALSE;
+        }
+
+        if (bw.getJingdu() !=null && bw.getWeidu() !=null){
+            Geographicallocation gs = publicService.getRegionByAddress(String.valueOf(bw.getJingdu()),String.valueOf(bw.getWeidu()));
+            if (gs != null){
+                req.setSfen(gs.getProvince());
+                req.setCshi(gs.getCity());
+                req.setCounty(gs.getArea());
+                req.setXzhen(gs.getStreet());
+                return Boolean.FALSE;
+            }
+        }
+
+        // 写入表备注信息
+        updateWorkerUploadLag(item,"师傅服务区域信息不存在");
+        return Boolean.TRUE;
     }