add

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

@@ -7,6 +7,7 @@ import com.zfire.jiasm.syncdata.api.OrderAddBeanDTO;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderTypeEnum;
+import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.dao.mapper.*;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.parameter.ReAppointment;
@@ -937,18 +938,18 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
             upOrder.setBrandName(websitFWS.getBrandName());
         }*/
 
-        // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id
-        String wdnoq = item.getXjwdno();
-        if (StringUtils.isEmpty(wdno)){
-            wdnoq = item.getWxwdno();
-        }
 
-        if (StringUtils.isEmpty(upOrder.getBrandId())){
+        // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id
+        if (upOrder.getOrderType().equals(ServiceCategoryEnum.REPAIR_TYPE.getCode()) &&
+                StringUtils.isEmpty(upOrder.getBrandId())){
+            String wdnoq = item.getXjwdno();
+            if (StringUtils.isEmpty(wdnoq)){
+                wdnoq = item.getWxwdno();
+            }
             websitFWS = publicService.shshwdToptshwd(wdnoq,upOrder);
             upOrder.setBrandId(websitFWS.getBrandId());
             upOrder.setBrandName(websitFWS.getBrandName());
         }
-
     }
 
     @NotNull

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zfire.jiasm.syncdata.constant.GDOrderStatusEnum;
 import com.zfire.jiasm.syncdata.constant.OrderStatusEnum;
+import com.zfire.jiasm.syncdata.constant.ServiceCategoryEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.mapper.OrderBaseMapper;
 import com.zfire.jiasm.syncdata.plus.service.*;
@@ -590,6 +591,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
             orderBase.setBrandId(websitFWS.getBrandId());
             orderBase.setBrandName(websitFWS.getBrandName());
         }*/
+
+        // 结算主体重置 维修网点一般是不填销售单位的通过售后网点来查结算主体   (a.xjwdno,''),a.wxwdno) as websit_id
+        if (orderBase.getOrderType().equals(ServiceCategoryEnum.REPAIR_TYPE.getCode()) &&
+                StringUtils.isEmpty(orderBase.getBrandId())){
+
+            String wdnoq = item.getXjwdno();
+            if (StringUtils.isEmpty(wdnoq)){
+                wdnoq = item.getWxwdno();
+            }
+            websitFWS = publicService.shshwdToptshwd(wdnoq,orderBase);
+            orderBase.setBrandId(websitFWS.getBrandId());
+            orderBase.setBrandName(websitFWS.getBrandName());
+        }
     }
 
     @Override