add

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

@@ -11,7 +11,7 @@ import com.zfire.jiasm.syncdata.dao.mapper.AZGDLcLsDownloadMapper;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.response.WebsitSH;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
@@ -1084,7 +1084,7 @@ public class InstallBusiness {
 
     private OrderInstall getOrderInstall(OrderBase orderBase, Brand brand, ItfTblAzAssignLcLsDownload item,ItfTblAzAssignFeeDownload fyqd) {
         OrderInstall orderInstall = new OrderInstall();
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
 
         if (fyqd !=null){
             OrderPar request = new OrderPar();
@@ -1094,14 +1094,14 @@ public class InstallBusiness {
 
             orderInstall = azGDFYQDDownloadMapper.getOrderFYQD(request);
             // 创建网点信息
-            websitSH = publicService.shxswdToptxswd(item.getCjwdno(),orderBase.getMainId());
-            if (StringUtils.isNotEmpty(websitSH.getWdId())){
-                orderInstall.setShopNo(websitSH.getWdId());
-                orderInstall.setShopName(websitSH.getWdmc());
+            websitFWS = publicService.shxswdToptxswd(item.getCjwdno(),orderBase.getMainId());
+            if (StringUtils.isNotEmpty(websitFWS.getWdId())){
+                orderInstall.setShopNo(websitFWS.getWdId());
+                orderInstall.setShopName(websitFWS.getWdmc());
             } else {
-                websitSH = publicService.shshwdToptshwd(item.getCjwdno(),orderBase.getMainId(),orderBase);
-                orderInstall.setShopNo(websitSH.getWdId());
-                orderInstall.setShopName(websitSH.getWdmc());
+                websitFWS = publicService.shshwdToptshwd(item.getCjwdno(),orderBase.getMainId(),orderBase);
+                orderInstall.setShopNo(websitFWS.getWdId());
+                orderInstall.setShopName(websitFWS.getWdmc());
             }
 
             // 工单号
@@ -1117,7 +1117,7 @@ public class InstallBusiness {
     @NotNull
     private List<OrderInstallOperatingLog> getOrderInstallOperatingLogs(List<ItfTblAzAssignFkmxDownload> fkmxs, OrderBase orderBase, Brand brand, ItfTblAzAssignLcLsDownload item) {
         List<OrderInstallOperatingLog> oiolList = new ArrayList<>();
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
         for (ItfTblAzAssignFkmxDownload fkmx : fkmxs){
             OrderPar orderPar = new OrderPar();
             orderPar.setSynReqId(fkmx.getSynReqId());
@@ -1125,12 +1125,12 @@ public class InstallBusiness {
             OrderInstallOperatingLog oiol = azGDFkMxDownloadMapper.getOrderFkMx(orderPar);
 
             // 反馈网点处理，先从售后网点查看
-            websitSH = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase.getMainId(),orderBase);
-            if (StringUtils.isEmpty(websitSH.getWdId())){
-                websitSH = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
+            websitFWS = publicService.shshwdToptshwd(oiol.getWebsitNumber(),orderBase.getMainId(),orderBase);
+            if (StringUtils.isEmpty(websitFWS.getWdId())){
+                websitFWS = publicService.shxswdToptxswd(oiol.getWebsitNumber(),orderBase.getMainId());
             }
-            oiol.setOperateWebsit(websitSH.getWdId());
-            oiol.setWebsitNumber(websitSH.getWdmc());
+            oiol.setOperateWebsit(websitFWS.getWdId());
+            oiol.setWebsitNumber(websitFWS.getWdmc());
 
             // 工单号码
             oiol.setOrderBaseId(orderBase.getId());

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

@@ -11,7 +11,7 @@ import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.parameter.ReAppointment;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.response.WebsitSH;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import lombok.extern.slf4j.Slf4j;
@@ -467,11 +467,11 @@ public class RepairBusiness {
         } else {
             wdno = item.getWxwdno();
         }
-        WebsitSH resultData = publicService.WebsitToSH(wdno, brand.getBrandId());
+        WebsitFWS resultData = publicService.WebsitToSH(wdno, brand.getBrandId());
         upOrder.setWebsitId(resultData.getWdId());
         upOrder.setWebsitName(resultData.getWdmc());
         if (StringUtils.isNotEmpty(item.getXjwdno())){
-            WebsitSH res = publicService.WebsitToSH(item.getXjwdno(), brand.getBrandId());
+            WebsitFWS res = publicService.WebsitToSH(item.getXjwdno(), brand.getBrandId());
             upOrder.setReceWebsitId(res.getWdId());
             upOrder.setReceWebsitName(res.getWdmc());
         } else {
@@ -517,7 +517,7 @@ public class RepairBusiness {
 
     @NotNull
     private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id,String mainId) {
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
         OrderPar orderPar = new OrderPar();
 
         orderPar.setSynReqId(item.getSynReqId());
@@ -528,11 +528,11 @@ public class RepairBusiness {
         upOrder.setOutUpdateSynReqTime(new Date());
 
         // 销售网点处理
-        websitSH = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),mainId);
-        upOrder.setSaleWebsitId(websitSH.getWdId());
-        upOrder.setSaleWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),mainId);
+        upOrder.setSaleWebsitId(websitFWS.getWdId());
+        upOrder.setSaleWebsitName(websitFWS.getWdmc());
         // 这里为商户的系统网点编号
-        upOrder.setSaleWebsitSysNumber(websitSH.getBrandSysWebsitNumber());
+        upOrder.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
 
         // upOrder.setUpdateTime(new Date());
         return upOrder;
@@ -703,9 +703,9 @@ public class RepairBusiness {
         up.setReadStatus(yd.getYdbz());
         up.setReadTime(yd.getYdsj());
         up.setReadName(yd.getYdrmc());
-        WebsitSH websitSH = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
-        up.setWebsitId(websitSH.getWdId());
-        up.setWebsitName(websitSH.getWdmc());
+        WebsitFWS websitFWS = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
+        up.setWebsitId(websitFWS.getWdId());
+        up.setWebsitName(websitFWS.getWdmc());
         oilistUp.add(up);
     }
 
@@ -722,9 +722,9 @@ public class RepairBusiness {
         add.setReadStatus(yd.getYdbz());
         add.setReadName(yd.getYdrmc());
         add.setReadTime(yd.getYdsj());
-        WebsitSH websitSH = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
-        add.setWebsitId(websitSH.getWdId());
-        add.setWebsitName(websitSH.getWdmc());
+        WebsitFWS websitFWS = publicService.WebsitToSH(yd.getWdno(), brand.getBrandId());
+        add.setWebsitId(websitFWS.getWdId());
+        add.setWebsitName(websitFWS.getWdmc());
         oilist.add(add);
     }
 
@@ -769,9 +769,9 @@ public class RepairBusiness {
             // 只插入一条sxlx = 0的首评记录
             if (canInsert.equals(1)){
                 // 增加评价记录
-                WebsitSH websitSH = addappraise(brand, sysDictRefDLMap, s);
+                WebsitFWS websitFWS = addappraise(brand, sysDictRefDLMap, s);
                 // 增加差评短信
-                addcpsms(order, s, websitSH);
+                addcpsms(order, s, websitFWS);
             }
 
             // 已评价过 新增时基础表不再操作追评 因为工单基础表无追评数据可存
@@ -826,9 +826,9 @@ public class RepairBusiness {
             // 只插入一条sxlx = 0的首评记录
             if (canInsert.equals(1)){
                 // 增加评价记录
-                WebsitSH websitSH = addappraise(brand, sysDictRefDLMap, s);
+                WebsitFWS websitFWS = addappraise(brand, sysDictRefDLMap, s);
                 // 增加差评短信
-                addcpsms(order, s, websitSH);
+                addcpsms(order, s, websitFWS);
             }
 
             // 未评价过工单基础表写入首次评价数据
@@ -841,7 +841,7 @@ public class RepairBusiness {
         }
     }
 
-    private void addcpsms(OrderBase order, ItfTblAssignSatisfactionDownload s, WebsitSH websitSH) {
+    private void addcpsms(OrderBase order, ItfTblAssignSatisfactionDownload s, WebsitFWS websitFWS) {
         if (s.getPjnr().equals("3") || s.getPjnr().indexOf("不满意")>0){
             if (StringUtils.isNotEmpty(s.getHfwdno()) && s.getHfwdno().equals("99999999")){
                 FaGreeSms fs = new FaGreeSms();
@@ -854,7 +854,7 @@ public class RepairBusiness {
                 fs.setFsma(String.valueOf(random.nextInt(10000)));
                 fs.setFsnr("您收到一张客户的投诉工单，请及时处理！工单号：" + String.valueOf(s.getPgid()) +
                         ",服务人员：" + order.getWorkerName());
-                fs.setSjid(websitSH.getWdlxdh());
+                fs.setSjid(websitFWS.getWdlxdh());
                 fs.setYhlb(2);
                 faGreeSmsService.save(fs);
             }
@@ -862,7 +862,7 @@ public class RepairBusiness {
     }
 
     @NotNull
-    private WebsitSH addappraise(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
+    private WebsitFWS addappraise(Brand brand, Map<String, List<SysDictRef>> sysDictRefDLMap, ItfTblAssignSatisfactionDownload s) {
         Boolean canAppeal = Boolean.TRUE;
         Integer appeal = 0;
         ReAppointment rq = new ReAppointment();
@@ -888,15 +888,15 @@ public class RepairBusiness {
         OrderAppraise add = assignSatisfactionDownloadMapper.getOrderAppraise(rq);
 
         // rvisit_websit_id 单独处理
-        WebsitSH websitSH = publicService.WebsitToSH(s.getHfwdno(), brand.getBrandId());
-        add.setRvisitWebsitId(websitSH.getWdId());
-        add.setRvisitWebsitName(websitSH.getWdmc());
+        WebsitFWS websitFWS = publicService.WebsitToSH(s.getHfwdno(), brand.getBrandId());
+        add.setRvisitWebsitId(websitFWS.getWdId());
+        add.setRvisitWebsitName(websitFWS.getWdmc());
         // splb 商品大类  单独处理
         add.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
         // can_appeal 是否可发起申诉   单独处理
         add.setCanAppeal(appeal);
         orderAppraiseService.save(add);
-        return websitSH;
+        return websitFWS;
     }
 
     private void upOrderBasePJ(OrderBase order, ItfTblAssignSatisfactionDownload s) {
@@ -1014,9 +1014,9 @@ public class RepairBusiness {
         add.setFeedback(fkmx.getFkjg());
         add.setOperator(fkmx.getFkren());
         add.setOperatorNumber(fkmx.getFkrenmc());
-        WebsitSH websitSH = publicService.WebsitToSH(fkmx.getFkwdno(), brand.getBrandId());
-        add.setOperateWebsit(websitSH.getWdmc());
-        add.setWebsitPhone(websitSH.getWdlxdh());
+        WebsitFWS websitFWS = publicService.WebsitToSH(fkmx.getFkwdno(), brand.getBrandId());
+        add.setOperateWebsit(websitFWS.getWdmc());
+        add.setWebsitPhone(websitFWS.getWdlxdh());
         add.setWorkerOrderStatus(order.getOrderStatus());// 反馈时的工单状态
         add.setBeforeOrderStatus(order.getLastOrderStatus());// 操作前工单状态 - 上一流程状态
         add.setBeforeDispatchStatus(order.getDispatchStatus());// 操作前派工状态
@@ -1096,7 +1096,7 @@ public class RepairBusiness {
         List<ItfTblAssignMxDownload> mxRec = new ArrayList<>();
         List<OrderProduct> addmx = new ArrayList<>();
         List<ItfTblAssignMxDownload> ups = new ArrayList<>();
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
 
 
         // 提取明细表数据
@@ -1112,12 +1112,12 @@ public class RepairBusiness {
             mxreq.setBrandId(brand.getBrandId());
             OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
             // 销售单位处理 sale_websit
-            websitSH = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
-            op.setSaleWebsit(websitSH.getWdId());
+            websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
+            op.setSaleWebsit(websitFWS.getWdId());
 
             // 服务单位处理 service_websit
-            websitSH = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
-            op.setServiceWebsit(websitSH.getWdId());
+            websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
+            op.setServiceWebsit(websitFWS.getWdId());
 
             // 其他部分参数赋值
             op.setOrderBaseId(order.getId());
@@ -1239,16 +1239,16 @@ public class RepairBusiness {
 
     @NotNull
     private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap, Map<String, List<SysDictRef>> sysDictRefXiLieMap, ItfTblAssignMxDownload rec, OrderPar mxreq) {
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
         OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
 
         // 其他部分参数赋值
         // 销售单位处理 sale_websit
-        websitSH = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
-        op.setSaleWebsit(websitSH.getWdId());
+        websitFWS = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId());
+        op.setSaleWebsit(websitFWS.getWdId());
         // 服务单位处理 service_websit
-        websitSH = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
-        op.setServiceWebsit(websitSH.getWdId());
+        websitFWS = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order);
+        op.setServiceWebsit(websitFWS.getWdId());
 
         op.setOrderBaseId(order.getId());
         op.setPgguid(item.getPgguid());

src/main/java/com/zfire/jiasm/syncdata/response/WebsitFWS.java

@@ -0,0 +1,24 @@
+package com.zfire.jiasm.syncdata.response;
+
+import lombok.Data;
+
+/**
+ * @author yaozx
+ * @version 1.0
+ * @description 介绍
+ * @date 2023-03-13
+ */
+@Data
+public class WebsitFWS {
+    // 服务商网点编码
+    private String wdId;
+
+    // 服务商网点名称
+    private String wdmc;
+
+    // 服务商网点联系电话
+    private String wdlxdh;
+
+    // 该字段存放品牌方的网点系统编号不需要转成平台的
+    private String brandSysWebsitNumber;
+}

src/main/java/com/zfire/jiasm/syncdata/response/WebsitSH.java

@@ -1,6 +1,5 @@
 package com.zfire.jiasm.syncdata.response;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -17,9 +16,6 @@ public class WebsitSH {
     // 商户网点名称
     private String wdmc;
 
-    // 网点联系电话
-    private String wdlxdh;
-
-    // 该字段存放品牌方的网点系统编号不需要转成平台的
+    // 商户系统编号
     private String brandSysWebsitNumber;
 }

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

@@ -2,6 +2,7 @@ package com.zfire.jiasm.syncdata.service;
 
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.response.WebsitPP;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.response.WebsitSH;
 
 import java.util.Date;
@@ -29,7 +30,7 @@ public interface PublicService {
     Map<String, List<SysDict>> getStringListMapXqLb();
 
     // 品牌网点对应商户网点
-    WebsitSH WebsitToSH(String websitNo, String brandId);
+    WebsitFWS WebsitToSH(String websitNo, String brandId);
     // 商户网点对应品牌网点
     WebsitPP WebsitToPP(String websitNo, String brandId);
     String getSHWDPhone(String websitNo);
@@ -47,8 +48,12 @@ public interface PublicService {
     void updateUploadTaskLisError(OutJiasmToGreeUploadTaskList ojtutl, String msg);
 
     // 商户销售网点对应平台销售网点
-    WebsitSH shxswdToptxswd(String websitNo, String category);
+    WebsitFWS shxswdToptxswd(String websitNo, String category);
     // 商户售后网点对应平台售后网点
-    WebsitSH shshwdToptshwd(String websitNo,String category,OrderBase orderBase);
+    WebsitFWS shshwdToptshwd(String websitNo, String category, OrderBase orderBase);
+    // 平台售后网点对应商户售后网点
+    WebsitSH ptshwdToshshwd(String websitNo);
+    // 平台销售网点对应商户销售网点
+    WebsitSH ptxswdToshxswd(String websitNo);
 
 }

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

@@ -9,7 +9,7 @@ import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignXzydDownloadService;
 import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
 import com.zfire.jiasm.syncdata.plus.service.OrderInformationService;
-import com.zfire.jiasm.syncdata.response.WebsitSH;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.service.DetailDownloadService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import org.jetbrains.annotations.NotNull;
@@ -155,7 +155,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 			req.setOrderNo(downloadTaskNo);
 			ItfTblAzAssignXzydDownload maxzd = installXzydDownloadMapper.getSynReqId(req);
 			OrderInformation info = new OrderInformation();
-			WebsitSH sh = new WebsitSH();
+			WebsitFWS sh = new WebsitFWS();
 			for (ItfTblAzAssignXzydDownload item:zdmx){
 				// 存在更新，不存在插入 order_information
 				info = orderInformationService.lambdaQuery()
@@ -186,7 +186,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 	}
 
 	public void upInformation(@NotNull Map<String, List<SysDict>> sysDictRefDLMap, Brand brand, OrderInformation info, ItfTblAzAssignXzydDownload item) {
-		WebsitSH sh;
+		WebsitFWS sh;
 		info.setAskCategoryId(item.getXzyqlb());
 		info.setAskCategoryName(sysDictRefDLMap.get(item.getXzyqlb()).get(0).getDictValue());
 		info.setRemark(item.getXzyq());
@@ -210,7 +210,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 
 	public void addInformation(Map<String, List<SysDict>> sysDictRefDLMap, Brand brand,
 								ItfTblAzAssignXzydDownload item, OrderBase orderBase) {
-		WebsitSH sh;
+		WebsitFWS sh;
 		OrderInformation info = new OrderInformation();
 		info.setId(item.getId());
 		info.setAskCategoryId(item.getXzyqlb());

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

@@ -15,6 +15,7 @@ import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.response.ResultData;
 import com.zfire.jiasm.syncdata.response.WebsitPP;
+import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.orderBaseInstallCjOrWgService;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
@@ -945,10 +946,17 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     private void setParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                          ItfTblAzWgmxJyktUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         setJysWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
 
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
+
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
             if (orderBase.getOverTime()!=null){
@@ -1003,10 +1011,16 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     private void setOtherParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                               ItfTblAzWgmxQitaUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         setOtherWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
 
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
             if (orderBase.getOverTime()!=null){
@@ -1061,10 +1075,16 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     private void setSyParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                            ItfTblAzWgmxSyktUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         setSyWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
 
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
             if (orderBase.getOverTime()!=null){

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.mapper.OrderBaseMapper;
 import com.zfire.jiasm.syncdata.plus.service.*;
-import com.zfire.jiasm.syncdata.response.WebsitSH;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.service.OrderService;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import org.springframework.beans.BeanUtils;
@@ -32,40 +32,40 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
     @Override
     public  void setPar(ItfTblAzAssignLcLsDownload item, OrderBase orderBase, Brand brand){
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
         // 品牌信息
         orderBase.setBrandId(brand.getBrandId());
         orderBase.setBrandName(brand.getBrand());
 
         // 售后网点处理
-        websitSH = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase.getMainId(),orderBase);
-        orderBase.setWebsitId(websitSH.getWdId());
-        orderBase.setWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase.getMainId(),orderBase);
+        orderBase.setWebsitId(websitFWS.getWdId());
+        orderBase.setWebsitName(websitFWS.getWdmc());
 
         // 接收派工网点处理
         if (item.getAzwdno().equals(orderBase.getReceWebsitId())){
             orderBase.setReceWebsitId(orderBase.getWebsitId());
             orderBase.setReceWebsitName(orderBase.getWebsitName());
         } else {
-            websitSH = publicService.shshwdToptshwd(orderBase.getReceWebsitId(),orderBase.getMainId(),orderBase);
-            orderBase.setReceWebsitId(websitSH.getWdId());
-            orderBase.setReceWebsitName(websitSH.getWdmc());
+            websitFWS = publicService.shshwdToptshwd(orderBase.getReceWebsitId(),orderBase.getMainId(),orderBase);
+            orderBase.setReceWebsitId(websitFWS.getWdId());
+            orderBase.setReceWebsitName(websitFWS.getWdmc());
         }
         // 创建网点处理
         if (item.getAzwdno().equals(orderBase.getCreateWebsitId())){
             orderBase.setCreateWebsitId(orderBase.getWebsitId());
             orderBase.setCreateWebsitName(orderBase.getWebsitName());
         } else {
-            websitSH = publicService.shshwdToptshwd(orderBase.getCreateWebsitId(),orderBase.getMainId(),orderBase);
-            orderBase.setCreateWebsitId(websitSH.getWdId());
-            orderBase.setCreateWebsitName(websitSH.getWdmc());
+            websitFWS = publicService.shshwdToptshwd(orderBase.getCreateWebsitId(),orderBase.getMainId(),orderBase);
+            orderBase.setCreateWebsitId(websitFWS.getWdId());
+            orderBase.setCreateWebsitName(websitFWS.getWdmc());
         }
         // 销售网点处理
-        websitSH = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase.getMainId());
-        orderBase.setSaleWebsitId(websitSH.getWdId());
-        orderBase.setSaleWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase.getMainId());
+        orderBase.setSaleWebsitId(websitFWS.getWdId());
+        orderBase.setSaleWebsitName(websitFWS.getWdmc());
         // 这里为商户的系统网点编号
-        orderBase.setSaleWebsitSysNumber(websitSH.getBrandSysWebsitNumber());
+        orderBase.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
 
         // 判断安装网点编号是否为空或者为公司，如果为空或为公司，就写入接收派工网点
         if (StringUtils.isEmpty(item.getAzwdno()) || item.getAzwdno().equals("S9219801") || item.getAzwdno().equals("S9219807")){
@@ -90,12 +90,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         orderBase.setCreateSys(orderBase.getCreateWebsitId());
 
         // 先从销售网点判断
-        websitSH = publicService.shxswdToptxswd(item.getXsdwno(),orderBase.getMainId());
-        if (StringUtils.isEmpty(websitSH.getWdId())){
-            websitSH = publicService.shshwdToptshwd(item.getXsdwno(),orderBase.getMainId(),orderBase);
+        websitFWS = publicService.shxswdToptxswd(item.getXsdwno(),orderBase.getMainId());
+        if (StringUtils.isEmpty(websitFWS.getWdId())){
+            websitFWS = publicService.shshwdToptshwd(item.getXsdwno(),orderBase.getMainId(),orderBase);
         }
-        orderBase.setLastOperatorWebsit(websitSH.getWdId());
-        orderBase.setSysWebsitNumber(websitSH.getBrandSysWebsitNumber());
+        orderBase.setLastOperatorWebsit(websitFWS.getWdId());
+        orderBase.setSysWebsitNumber(websitFWS.getBrandSysWebsitNumber());
 
     }
 
@@ -103,7 +103,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
 
     @Override
     public void setParame(Brand brand, OrderBase orderBase, ItfTblAssignDownload item) {
-        WebsitSH websitSH = new WebsitSH();
+        WebsitFWS websitFWS = new WebsitFWS();
 
         orderBase.setBrandId(brand.getBrandId());
         orderBase.setBrandName(brand.getBrand());
@@ -121,25 +121,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         }
 
         // 售后网点处理
-        websitSH = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase.getMainId(),orderBase);
-        orderBase.setWebsitId(websitSH.getWdId());
-        orderBase.setWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shshwdToptshwd(orderBase.getWebsitId(),orderBase.getMainId(),orderBase);
+        orderBase.setWebsitId(websitFWS.getWdId());
+        orderBase.setWebsitName(websitFWS.getWdmc());
         // 接收派工网点处理
-        websitSH = publicService.shshwdToptshwd(orderBase.getReceWebsitId(),orderBase.getMainId(),orderBase);
-        orderBase.setReceWebsitId(websitSH.getWdId());
-        orderBase.setReceWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shshwdToptshwd(orderBase.getReceWebsitId(),orderBase.getMainId(),orderBase);
+        orderBase.setReceWebsitId(websitFWS.getWdId());
+        orderBase.setReceWebsitName(websitFWS.getWdmc());
 
         // 创建网点处理
-        websitSH = publicService.shshwdToptshwd(orderBase.getCreateWebsitId(),orderBase.getMainId(),orderBase);
-        orderBase.setCreateWebsitId(websitSH.getWdId());
-        orderBase.setCreateWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shshwdToptshwd(orderBase.getCreateWebsitId(),orderBase.getMainId(),orderBase);
+        orderBase.setCreateWebsitId(websitFWS.getWdId());
+        orderBase.setCreateWebsitName(websitFWS.getWdmc());
 
         // 销售网点处理
-        websitSH = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase.getMainId());
-        orderBase.setSaleWebsitId(websitSH.getWdId());
-        orderBase.setSaleWebsitName(websitSH.getWdmc());
+        websitFWS = publicService.shxswdToptxswd(orderBase.getSaleWebsitId(),orderBase.getMainId());
+        orderBase.setSaleWebsitId(websitFWS.getWdId());
+        orderBase.setSaleWebsitName(websitFWS.getWdmc());
         // 这里为商户的系统网点编号
-        orderBase.setSaleWebsitSysNumber(websitSH.getBrandSysWebsitNumber());
+        orderBase.setSaleWebsitSysNumber(websitFWS.getBrandSysWebsitNumber());
 
 
 

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

@@ -9,10 +9,10 @@ import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.response.SSQS;
 import com.zfire.jiasm.syncdata.response.WebsitPP;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
 import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -214,8 +214,8 @@ public class PublicServiceImpl implements PublicService {
 
     // 品牌网点对应商户网点
     @Override
-    public WebsitSH WebsitToSH(String websitNo, String brandId){
-        WebsitSH resultData = new WebsitSH();
+    public WebsitFWS WebsitToSH(String websitNo, String brandId){
+        WebsitFWS resultData = new WebsitFWS();
 
         resultData.setWdId("");
         resultData.setWdmc("");
@@ -392,6 +392,51 @@ public class PublicServiceImpl implements PublicService {
 
    // /////////////////////////////////////////////////////////////////
 
+    /**
+     * 商户销售网点对应平台销售网点
+     * @param websitNo  服务商售后网点编号
+     * @return
+     */
+    @Override
+    public WebsitSH ptxswdToshxswd(String websitNo) {
+        WebsitSH resultData = new WebsitSH();
+        if (StringUtils.isEmpty(websitNo)) {
+            return resultData;
+        }
+
+        List<CustomerInformationWebsit> cIWebsitList = customerInformationWebsitService.lambdaQuery()
+                .eq(CustomerInformationWebsit::getWebsitId, websitNo).list();
+        if (CollectionUtils.isNotEmpty(cIWebsitList)) {
+            resultData.setWdId(cIWebsitList.get(0).getWebsitId());
+            resultData.setWdmc(cIWebsitList.get(0).getRefWebsitName());
+            resultData.setBrandSysWebsitNumber(cIWebsitList.get(0).getRefSysWebsitNumber());
+        }
+
+        return resultData;
+    }
+
+    /**
+     * 商户售后网点对应平台售后网点
+     * @param websitNo  服务商售后网点编号
+     */
+    @Override
+    public WebsitSH ptshwdToshshwd(String websitNo){
+        WebsitSH resultData = new WebsitSH();
+        if (StringUtils.isEmpty(websitNo)){
+            return resultData;
+        }
+        List<WebsitOrderSign> wos = websitOrderSignService.lambdaQuery()
+                .eq(WebsitOrderSign::getWebsitId, websitNo)
+                .list();
+
+        if (CollectionUtils.isNotEmpty(wos)) {
+            resultData.setWdId(wos.get(0).getBrandId());
+            resultData.setWdmc(wos.get(0).getBrandWebsitName());
+            resultData.setBrandSysWebsitNumber(wos.get(0).getBrandSysWebsitNumber());
+        }
+        return resultData;
+    }
+
 
     /**
      * 商户销售网点对应平台销售网点
@@ -401,8 +446,8 @@ public class PublicServiceImpl implements PublicService {
      * @return
      */
     @Override
-    public WebsitSH shxswdToptxswd(String websitNo, String category){
-        WebsitSH resultData = new WebsitSH();
+    public WebsitFWS shxswdToptxswd(String websitNo, String category){
+        WebsitFWS resultData = new WebsitFWS();
         if (StringUtils.isEmpty(websitNo)){
             return resultData;
         }
@@ -439,8 +484,8 @@ public class PublicServiceImpl implements PublicService {
      * @return
      */
    @Override
-   public WebsitSH shshwdToptshwd(String websitNo, String category, OrderBase orderBase){
-       WebsitSH resultData = new WebsitSH();
+   public WebsitFWS shshwdToptshwd(String websitNo, String category, OrderBase orderBase){
+       WebsitFWS resultData = new WebsitFWS();
        if (StringUtils.isEmpty(websitNo)){
            return resultData;
        }
@@ -626,7 +671,7 @@ public class PublicServiceImpl implements PublicService {
     }
 
     // 提取平台网点名称及服务热线
-    private  void getNameAndHotline(WebsitSH req){
+    private  void getNameAndHotline(WebsitFWS req){
         CustomerInformation customerInformation = customerInformationService.lambdaQuery()
                 .eq(CustomerInformation::getWebsitId,req.getWdId()).one();
 

src/main/java/com/zfire/jiasm/syncdata/upload/order/InstallProduceDataUploadList.java

@@ -18,6 +18,8 @@ import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
 import com.zfire.jiasm.syncdata.response.ResultData;
 import com.zfire.jiasm.syncdata.response.WebsitPP;
+import com.zfire.jiasm.syncdata.response.WebsitFWS;
+import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.orderBaseInstallCjOrWgService;
 import com.zfire.jiasm.syncdata.utils.MyBeanUtils;
@@ -1126,9 +1128,14 @@ public class InstallProduceDataUploadList {
 
     private void setParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                          ItfTblAzWgmxJyktUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
         setJysWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
 
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
@@ -1182,9 +1189,15 @@ public class InstallProduceDataUploadList {
 
     private void setOtherParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                               ItfTblAzWgmxQitaUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         setOtherWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
 
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
@@ -1238,10 +1251,16 @@ public class InstallProduceDataUploadList {
 
     private void setSyParm(Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls, Integer cjstat,
                            ItfTblAzWgmxSyktUpload mxup, OrderInstallDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         setSyWdno(brand, orderBase, mxup);
         mxup.setCjren(orderBase.getCreateBy());
         mxup.setCjrmc(orderBase.getCreateName());
 
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(mxup.getCzwd());
+        mxup.setCzwd(websitSH.getWdId());
+
         mxup.setStat(cjstat);
         if (cjstat.equals("1120")){
             if (orderBase.getOverTime()!=null){
@@ -1400,11 +1419,30 @@ public class InstallProduceDataUploadList {
 
     @NotNull
     private ItfTblAzAssignLcLsUpload getItfTblAzAssignLcLsUpload(@NotNull Brand brand, OutJiasmToGreeUploadTaskList ojtutl) {
+        WebsitSH websitSH = new WebsitSH();
         OrderPar orderPar = new OrderPar();
         orderPar.setBrandId(brand.getBrandId());
         orderPar.setOrderNo(ojtutl.getId());
         ItfTblAzAssignLcLsUpload lcls = gdOrderBaseMapper.getAZOrderBase(orderPar);
         lcls.setUploadTaskSynReqId(ojtutl.getSynReqId());
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(lcls.getAzwdno());
+        lcls.setAzwdno(websitSH.getWdId());
+        lcls.setAzwdmc(websitSH.getWdmc());
+        lcls.setAzwdxtbh(websitSH.getBrandSysWebsitNumber());
+        lcls.setCjwdno(websitSH.getWdId());
+        lcls.setCjwdxtbh(websitSH.getBrandSysWebsitNumber());
+        lcls.setZjczwd(websitSH.getWdId());
+        lcls.setZjczwdxtbh(websitSH.getBrandSysWebsitNumber());
+        // 接收派工网点也可认为是售后网点处理
+        websitSH = publicService.ptshwdToshshwd(lcls.getJspgwdno());
+        lcls.setJspgwdno(websitSH.getWdId());
+        lcls.setJspgwdmc(websitSH.getWdmc());
+        lcls.setJspgwdxtbh(websitSH.getBrandSysWebsitNumber());
+
+
+
+
         // 省市等信息单独处理
         setssxz(lcls);
         return lcls;

src/main/java/com/zfire/jiasm/syncdata/upload/order/RepairProduceDataUploadList.java

@@ -15,6 +15,7 @@ import com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.*;
+import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.*;
 import lombok.extern.slf4j.Slf4j;
@@ -1106,6 +1107,8 @@ public class RepairProduceDataUploadList {
     }
 
     private ItfTblWxjsJyktUpload generateJykt(Brand brand, OrderBase orderBase, OrderRepairDetail detail) {
+        WebsitSH websitSH = new WebsitSH();
+
         // 修改序采集单内的序
         upOrderRepairDetail(orderBase);
 
@@ -1120,6 +1123,20 @@ public class RepairProduceDataUploadList {
         request.setId(detail.getId());
         request.setBrandId(brand.getBrandId());
         ItfTblWxjsJyktUpload jykt = detailOrderRepairMapper.getItfTblWxjsJyktUpload(request);
+        // 售后网点处理
+        websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId());
+        jykt.setAzwdbh(websitSH.getWdId());
+        jykt.setAzwdmc(websitSH.getWdmc());
+        // 维修网点即售后网点处理
+        jykt.setWxwdno(websitSH.getWdId());
+        jykt.setWxwdmc(websitSH.getWdmc());
+
+
+        // 结算网点编号即售后网点处理
+        websitSH = publicService.ptshwdToshshwd(jykt.getJswdno());
+        jykt.setJswdno(websitSH.getWdId());
+        jykt.setJswdmc(websitSH.getWdmc());
+
         jykt.setBxrq(orderBase.getCreateTime());
         if (orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G8.getCode()) ||
                 orderBase.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G9.getCode()) ||

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -12,7 +12,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -29,9 +29,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                       (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                               (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
@@ -47,7 +44,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -64,9 +61,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
@@ -83,7 +77,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -100,9 +94,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                      (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                              (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
@@ -118,7 +109,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -135,9 +126,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                      (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                              (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
@@ -153,7 +141,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -170,9 +158,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                      (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                              (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
@@ -188,7 +173,7 @@
                            when 'out' 	then '更换外机'
                            else '安装整机'	end as aznr,
                '' as zjia, 0 as jcguan, '' kqkg,'' as gkzy,'' as yccxqk,a.worker_mobile as shji,a.worker_name as czren,a.first_time as czsj,
-               f.brand_websit_number as czwd,
+               a.operator_websit_id as czwd,
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
@@ -205,9 +190,6 @@
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
-                 left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-                           (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
                  left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}

src/main/resources/mapper/DetailOrderRepairMapper.xml

@@ -5,7 +5,7 @@
     <select id="getItfTblWxjsJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsJyktUpload">
         select a.order_base_id as worker_order_no,a.out_id as fa_order_repair_detail_id,a.brand_wxjsguid as wxjsguid,
                'guangfo' as created_by,a.create_time as created_date,'guangfo' as last_modified_by,a.update_time as last_modified_date,
-               a.brand_pgid as pgid,b.brand_websit_number as jswdno,b.brand_websit_name as jswdmc,a.repair_type_three as wxlx3,
+               a.brand_pgid as pgid,a.settle_websit_id as jswdno,a.repair_type_three as wxlx3,
                if(c.ref_dict_code in(104,106),1,case a.type when 'INSIDE' then 2 when 'OUT' then 1 else 3 end) as nwji,
                if(c.ref_dict_code in(104,106) and (a.out_code is null or a.out_code = ''), a.inside_code, a.out_code)	as jqtm,
                case when length(a.out_number)>10 then left(a.in_number,10) else a.out_number end as wjxin,a.out_style as wjms,if(c.ref_dict_code in(104,106), '', a.inside_code) as njtm,'' as njtm2,
@@ -13,8 +13,7 @@
                a.in_style as njmc,a.invoice_no as fpbh,a.install_time as azrq,
                if(d.update_time is null,max(e.update_time), d.update_time)	as xfrq,a.brand_wxgid as wxgid,a.worker_name as wxgmc,
                a.worker_mobile as wxgdh,a.repair_fees as wxfy,a.traffic_expense as jtfy,a.other_fees as qtfy,a.total_fees as zjfy,
-               a.settle_bill as jsdh,a.clearing as jszt,f.brand_websit_number as azwdbh,
-               f.brand_websit_name as azwdmc,g.brand_websit_number as wxwdno,g.brand_websit_name as wxwdmc,a.trouble as gzxx,
+               a.settle_bill as jsdh,a.clearing as jszt,a.trouble as gzxx,
                a.trouble_analysis as gzfx,a.repaire_item as wxnr,a.remark as beiz,a.create_time as ldrq,
                ifnull(k.brand_worker_id,'') as czrid,
                a.worker_name as czrmc,a.gps_address as gpsdzxx,d.user_mobile as yddh,0 as zsfy,0 as dzfy,h.ref_dict_code as spid,
@@ -23,24 +22,13 @@
                case when length(a.lat) >12  then left(a.lat,12) else a.lat end as sjcjwd,
                if(j.zbby = '1' and c.ref_dict_code = 101 , 8, 1 ) as wxlx,a.over_time as bwgsj
         from order_repair_detail a
-                 left join brand_websit b on b.group_company_id = #{request.brandId} and b.brand_websit_number in
-        (select brand_websit_id from websit_order_sign
-        where brand_id = #{request.brandId} and websit_id =a.settle_websit_id)
-        left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
-        left join order_base d on d.id=a.order_base_id
-        left join order_repair_operating_log e on e.order_base_id=a.order_base_id
-        left join brand_websit f on f.group_company_id = #{request.brandId} and f.brand_websit_number in
-        (select brand_websit_id from websit_order_sign
-        where brand_id = #{request.brandId} and websit_id in
-        (select install_websit_id from order_base where id = #{request.orderNo}))
-        left join brand_websit g on g.group_company_id = #{request.brandId} and g.brand_websit_number in
-        (select brand_websit_id from websit_order_sign
-        where brand_id = #{request.brandId} and websit_id in
-        (select websit_id from order_base where id = #{request.orderNo}))
-        left join sys_dict_ref h on h.dict_code=a.main_id and h.brand_id = #{request.brandId} and h.dict_type='MAIN_TYPE'
-        left join order_product i on i.order_base_id = a.order_base_id and i.id = a.repair_product_id
-        left join order_repair j on j.order_base_id = a.order_base_id
-        left join worker_brand_account k on k.worker_id = a.worker_id and k.websit_id = a.websit_id and k.del=0
+             left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
+             left join order_base d on d.id=a.order_base_id
+             left join order_repair_operating_log e on e.order_base_id=a.order_base_id
+             left join sys_dict_ref h on h.dict_code=a.main_id and h.brand_id = #{request.brandId} and h.dict_type='MAIN_TYPE'
+             left join order_product i on i.order_base_id = a.order_base_id and i.id = a.repair_product_id
+             left join order_repair j on j.order_base_id = a.order_base_id
+             left join worker_brand_account k on k.worker_id = a.worker_id and k.websit_id = a.websit_id and k.del=0
         where a.order_base_id = #{request.orderNo} and a.id =  #{request.id}
     </select>
 

src/main/resources/mapper/GDOrderBaseMapper.xml

@@ -9,10 +9,9 @@
                     when b.belong_company = 'S9219807' then '0756'
                     when b.belong_company = 'S9219801' then '020'
                   else a.area_code end as quhao,
-               a.tel_phone as dhhm,a.address as dizi,a.info_channel as xxqd,a.info_source as xxly,a.remark as beiz,a.user_attr as yhsx,
-               c.ref_dict_code as spid,c.ref_dict_name as spmc,d.brand_worker_id as azrenid,a.worker_name as azren,
-               e.brand_websit_id as azwdno,e.brand_websit_name as azwdmc,e.brand_sys_websit_number as azwdxtbh,
-               f.brand_websit_id as jspgwdno,f.brand_websit_name as jspgwdmc,f.brand_sys_websit_number as jspgwdxtbh,
+               a.tel_phone as dhhm,a.address as dizi,a.info_channel as xxqd,a.info_source as xxly,a.remark as beiz,
+               a.user_attr as yhsx,c.ref_dict_code as spid,c.ref_dict_name as spmc,d.brand_worker_id as azrenid,
+               a.worker_name as azren,a.websit_id as azwdno,a.rece_websit_id as jspgwdno,
                a.rece_time as jspgwdsj,
                case  when g.belong_company in('X2300000', 'S9219807') then '佛山'
                      when g.belong_company in('X2100000', 'S9219801') then '广州'
@@ -20,8 +19,6 @@
                a.external_sys as qqlyno,a.external_name2 as qqlymc,a.external_no as qqlyxh,a.external_pk as qqlyzj,
                a.expect_start_time as yhqwkssj,a.expect_end_time as yhqwjssj,m.brand_order_state as stat,a.gps_address as gpsdzxx,
                a.create_by as cjren,a.create_name as cjrmc,a.create_time as cjdt,
-               e.brand_websit_id as cjwdno,e.brand_sys_websit_number as cjwdxtbh,
-               e.brand_websit_id as zjczwd,e.brand_sys_websit_number as zjczwdxtbh,
                a.last_operator_time as zjczsj,a.sale_type as xslx,
                a.appointment_time as yyazsj,
                case a.is_delivery_over when 'NO' then '0'
@@ -44,17 +41,15 @@
                a.area as xian,a.area_id as xianid,a.street as xzhen,a.street_id as xzhenid
         from order_base a
             left join brand_websit b on b.brand_websit_number=a.rece_websit_id and b.group_company_id = #{request.brandId}
-        left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
-        left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
-        left join websit_order_sign e on e.websit_id = a.websit_id and e.brand_id = #{request.brandId} and a.id = #{request.orderNo}
-        left join websit_order_sign f on f.websit_id = a.rece_websit_id and f.brand_id = #{request.brandId} and a.id = #{request.orderNo}
-        left join brand_websit g on g.group_company_id = #{request.brandId} and g.brand_websit_number in
-        (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-        (select rece_websit_id from order_base where id = #{request.orderNo}))
-        left join order_install j on j.order_base_id=a.id and a.id = #{request.orderNo}
-        left join customer_information_websit k on k.websit_id = a.sale_websit_id and k.brand_id = #{request.brandId} and a.id = #{request.orderNo}
-        left join order_state_contrast l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId} and l.flag=1
-        left join order_state_contrast m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId} and m.flag=1
+            left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
+            left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
+            left join brand_websit g on g.group_company_id = #{request.brandId} and g.brand_websit_number in
+                (select brand_websit_id from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                    (select rece_websit_id from order_base where id = #{request.orderNo}))
+            left join order_install j on j.order_base_id=a.id and a.id = #{request.orderNo}
+            left join customer_information_websit k on k.websit_id = a.sale_websit_id and k.brand_id = #{request.brandId} and a.id = #{request.orderNo}
+            left join order_state_contrast l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId} and l.flag=1
+            left join order_state_contrast m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId} and m.flag=1
         where a.id = #{request.orderNo}
     </select>