add

src/main/java/com/zfire/jiasm/syncdata/download/order/DetailDownloadInstallTask.java

@@ -47,8 +47,6 @@ public class DetailDownloadInstallTask {
 	@Scheduled(fixedDelayString = "${detaildown}")
 	private void process() {
 		try {
-
-
 			if (detaildownc.equals(TaskConfigEnum.FALSE.getCode())){
 				return;
 			}

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

@@ -42,10 +42,13 @@ public class GLPPWXGQueryAdd {
     @Scheduled(fixedDelayString = "${zjzxx}")
     public void process() throws Exception {
 
+        // 从格力总部同步师傅的证件照 只用来新增
         wxgQueryAddCertInfo();
 
+        // 新增 师傅服务类目信息
         wxgQueryAddCategory();
 
+        // 新增格力网点维修工数据
         wxgQueryAddWXGInfo();
 
     }

src/main/java/com/zfire/jiasm/syncdata/download/师傅数据下载.txt

@@ -19,4 +19,4 @@ worker_service_category_detail：师傅服务大类表
    从itf_tbl_wangdian_wxg_download表取数据同步到worker表
 
 
-平台网点对应的品牌网点websit_order_sign
+平台网点对应的品牌网点websit_order_sign 服务商网点与总部网点编号的对应关系

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

@@ -885,11 +885,14 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
 
         // 结算主体
         // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
-        if (StringUtils.isNotEmpty(upOrder.getWebsitId())){
+        /*if (StringUtils.isNotEmpty(upOrder.getWebsitId())){
             websitFWS = publicService.shshwdToptshwd(wdno,upOrder);
         } else {
             websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder);
-        }
+        }*/
+
+        websitFWS = publicService.shxswdToptxswd(item.getXswdno(),upOrder);
+        // 结算主体为销售网点对应的接算主休息
         upOrder.setBrandId(websitFWS.getBrandId());
         upOrder.setBrandName(websitFWS.getBrandName());
 

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

@@ -110,7 +110,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         // 省市区单独处理
         // shPositionTopt(orderBase);
         publicService.installOrderSSQJ(orderBase);
-        publicService.installOrderSSQJ(orderBase);
         // 派工方式，新创建订单时 azren 名称不为空时为手动派工  （dispatch_flag派工方式 A=自动派工 B=手动派工）
         if (StringUtils.isNotEmpty(orderBase.getDispatchFlag())){
             orderBase.setDispatchFlag("B");
@@ -159,17 +158,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         if (StringUtils.isNotEmpty(item.getAzwdno()) && item.getAzwdno().equals(orderBase.getReceWebsitId())) {
             orderBase.setReceWebsitId(orderBase.getWebsitId());
             orderBase.setReceWebsitName(orderBase.getWebsitName());
-            // 结算主体
-            orderBase.setBrandId(websitFWS.getBrandId());
-            orderBase.setBrandName(websitFWS.getBrandName());
+            // 结算主体 销售网点对应的接算主休息
+            // orderBase.setBrandId(websitFWS.getBrandId());
+            // orderBase.setBrandName(websitFWS.getBrandName());
 
         } else {
             websitFWS = publicService.shshwdToptshwd(orderBase.getReceWebsitId(), orderBase);
             orderBase.setReceWebsitId(websitFWS.getWebsitId());
             orderBase.setReceWebsitName(websitFWS.getWdmc());
             // 结算主体
-            orderBase.setBrandId(websitFWS.getBrandId());
-            orderBase.setBrandName(websitFWS.getBrandName());
+            // orderBase.setBrandId(websitFWS.getBrandId());
+            // orderBase.setBrandName(websitFWS.getBrandName());
         }
         // 创建网点处理
         if (StringUtils.isNotEmpty(item.getAzwdno()) && item.getAzwdno().equals(orderBase.getCreateWebsitId())) {
@@ -184,6 +183,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(), orderBase);
         orderBase.setSaleWebsitId(websitFWS.getWebsitId());
         orderBase.setSaleWebsitName(websitFWS.getWdmc());
+        // 结算主体 销售网点对应的接算主休息
+        orderBase.setBrandId(websitFWS.getBrandId());
+        orderBase.setBrandName(websitFWS.getBrandName());
+
         // 这里为商户的系统网点编号
         orderBase.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
     }
@@ -476,11 +479,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
         // 结算主体
         // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
-        if (StringUtils.isNotEmpty(orderBase.getWebsitId())){
+        /*if (StringUtils.isNotEmpty(orderBase.getWebsitId())){
             websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
         } else {
             websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
-        }
+        }*/
+
+        websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
+
         orderBase.setBrandId(websitFWS.getBrandId());
         orderBase.setBrandName(websitFWS.getBrandName());
         orderBase.setGroupCompanyId(websitFWS.getGroupCompanyId());
@@ -552,11 +558,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
         // 结算主体
         // (wxwdno、xjwdno)维修网点与派下级网点同时为空时  (cjwdno、xswdno)创建网点与销售网点都有值
-        if (StringUtils.isNotEmpty(orderBase.getWebsitId())){
+        /*if (StringUtils.isNotEmpty(orderBase.getWebsitId())){
             websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase);
         } else {
             websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
-        }
+        }*/
+        websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase);
         orderBase.setBrandId(websitFWS.getBrandId());
         orderBase.setBrandName(websitFWS.getBrandName());
         orderBase.setGroupCompanyId(websitFWS.getGroupCompanyId());

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

@@ -143,7 +143,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             return;
         }
 
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         // 提取品牌信息
@@ -1467,7 +1466,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             itass.setZjczwdxtbh(Long.valueOf(websitSH.getBrandSysWebsitNumber()));
         }
         itass.setCjwdno(websitSH.getWdId());
-        // 接收派工网点也可认为是售后网点处理
+        // 接收派工网点也可认为是售后网点处理 这里是不能为空的，为空时云售后无法显示
         itass.setXjwdno(websitSH.getWdId());
         itass.setXjwdmc(websitSH.getWdmc());
         // 提取安装师傅的账号信息