yaozhixue 1 year ago
parent
commit
9cf0675ac3

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -77,7 +77,7 @@ public class InstallBusinessApi {
         lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .lt(ItfTblAzAssignLcLsDownload::getSynTimes, 3)
-                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,5999)// 测试使用
+                // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,5999)// 测试使用
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();
 

+ 3 - 0
src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -121,6 +121,9 @@ public interface PublicService {
     // 中心下沉到总包商户 格力中心网点编号,工单
     void getZXINFO(String websitNo, OrderBase order);
 
+    // 中心下沉到总包服务商 格力中心网点编号,工单
+    void getZXPTZBINFO(String websitNo, OrderBase order);
+
     // 校验工单信息是否需要回传 工单ID、表名、记录ID
     Boolean checkWebsitSyncFlag(String orderNo,String tableName,Long recordId);
     Boolean checkWebsitSyncFlagT(String orderNo,String tableName,String recordId);

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

@@ -969,7 +969,7 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         if (item.getXjwdno().equals("S9219807") ||
                 item.getXjwdno().equals("S9219801") ||
                 item.getXjwdno().equals("S9329829")){
-            publicService.shshwdToptshwd(item.getXjwdno(), upOrder);
+            publicService.getZXPTZBINFO(item.getXjwdno(), upOrder);
         }
 
 

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

@@ -225,7 +225,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         if (item.getJspgwdno().equals("S9219807") ||
                 item.getJspgwdno().equals("S9219801") ||
                 item.getJspgwdno().equals("S9329829")){
-            publicService.shshwdToptshwd(item.getJspgwdno(), orderBase);
+            publicService.getZXPTZBINFO(item.getJspgwdno(), orderBase);
         }
     }
 
@@ -576,7 +576,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         if (item.getXjwdno().equals("S9219807") ||
                 item.getXjwdno().equals("S9219801") ||
                 item.getXjwdno().equals("S9329829")){
-            publicService.shshwdToptshwd(item.getXjwdno(), orderBase);
+            publicService.getZXPTZBINFO(item.getXjwdno(), orderBase);
         }
 
         // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id

+ 20 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1347,6 +1347,26 @@ public class PublicServiceImpl implements PublicService {
         order.setBrandName(websitFWS.getBrandName());
     }
 
+    // 中心下沉到总包服务商 格力中心网点编号,工单
+    @Override
+    public void getZXPTZBINFO(String websitNo, OrderBase order){
+        WebsitFWS 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());
+    }
+
     /**
      *   1:网点不存在需要回传的网点表内,改回传同步状态字段为99
      *   2:回传网点表为空时 一样不回传