add

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -113,6 +113,7 @@ public interface PublicService {
     // 找中心网点数据 参数为格力售后中心网点编号
     Belongcompany getBelongCompany(String bcp);
 
-
+    // 中心下沉到总包商户 格力中心网点编号，工单
+    void getZXINFO(String websitNo, OrderBase order);
 
 }

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

@@ -941,6 +941,13 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
             upOrder.setBrandName(websitFWS.getBrandName());
         }*/
 
+        // 格力中心的单直接下沉到总包商户(先查WebsitOrderSign 无数据再查CustomerInformationWebsit)
+        if (item.getXjwdno().equals("S9219807") ||
+                item.getXjwdno().equals("S9219801") ||
+                item.getXjwdno().equals("S9329829")){
+            publicService.getZXINFO(item.getXjwdno(), upOrder);
+        }
+
 
         // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id
         if (upOrder.getOrderType().equals(ServiceCategoryEnum.REPAIR_TYPE.getCode()) &&

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

@@ -192,10 +192,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         orderBase.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
 
         // jspgwdno 引入中心网点 S9219807,S9219801,S9329829
-        /*if (item.getJspgwdmc().equals("S9219807") ||
-                item.getJspgwdmc().equals("S9219801") ||
-                item.getJspgwdmc().equals("S9329829")){
-            websitFWS = publicService.shshwdToptshwdZX(item.getJspgwdmc(), orderBase);
+        /*if (item.getJspgwdno().equals("S9219807") ||
+                item.getJspgwdno().equals("S9219801") ||
+                item.getJspgwdno().equals("S9329829")){
+            websitFWS = publicService.shshwdToptshwdZX(item.getJspgwdno(), orderBase);
             orderBase.setCreateWebsitId(websitFWS.getWebsitId());
             orderBase.setCreateWebsitName(websitFWS.getWdmc());
             orderBase.setReceWebsitId(websitFWS.getWebsitId());
@@ -204,12 +204,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
             orderBase.setWebsitName(websitFWS.getWdmc());
 
             // 结算主体重置
-            Belongcompany bc = publicService.getBelongCompany(item.getJspgwdmc());
+            Belongcompany bc = publicService.getBelongCompany(item.getJspgwdno());
             websitFWS = publicService.shxswdToptxswd(bc.getBelongCompanySale(),orderBase);
             orderBase.setBrandId(websitFWS.getBrandId());
             orderBase.setBrandName(websitFWS.getBrandName());
         }*/
 
+        // 格力中心的单直接下沉到总包商户(先查WebsitOrderSign 无数据再查CustomerInformationWebsit)
+        if (item.getJspgwdno().equals("S9219807") ||
+                item.getJspgwdno().equals("S9219801") ||
+                item.getJspgwdno().equals("S9329829")){
+            publicService.getZXINFO(item.getJspgwdno(), orderBase);
+        }
     }
 
     private void extracted(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its) {
@@ -592,6 +598,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
             orderBase.setBrandName(websitFWS.getBrandName());
         }*/
 
+        // 格力中心的单直接下沉到总包商户(先查WebsitOrderSign 无数据再查CustomerInformationWebsit)
+        if (item.getXjwdno().equals("S9219807") ||
+                item.getXjwdno().equals("S9219801") ||
+                item.getXjwdno().equals("S9329829")){
+            publicService.getZXINFO(item.getXjwdno(), orderBase);
+        }
+
         // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id
         if (orderBase.getOrderType().equals(ServiceCategoryEnum.REPAIR_TYPE.getCode()) &&
                 StringUtils.isEmpty(orderBase.getBrandId())){

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

@@ -1241,6 +1241,26 @@ public class PublicServiceImpl implements PublicService {
         return bcs;
     }
 
+    // 中心下沉到总包商户 格力中心网点编号，工单
+    @Override
+    public void getZXINFO(String websitNo, OrderBase order){
+        WebsitFWS websitFWS = null;
+        websitFWS = shshwdToptshwd(websitNo, order);
+        if (StringUtils.isEmpty(websitFWS.getWebsitId())){
+            websitFWS = shxswdToptxswd(websitNo, order);
+        }
+        order.setReceWebsitId(websitFWS.getWebsitId());
+        order.setReceWebsitName(websitFWS.getWdmc());
+        order.setWebsitId(websitFWS.getWebsitId());
+        order.setWebsitName(websitFWS.getWdmc());
+
+        // 结算主体重置
+        Belongcompany bc = getBelongCompany(websitNo);
+        websitFWS = shxswdToptxswd(bc.getBelongCompanySale(),order);
+        order.setBrandId(websitFWS.getBrandId());
+        order.setBrandName(websitFWS.getBrandName());
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";