|
@@ -602,6 +602,67 @@ public class PublicServiceImpl implements PublicService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 商户售后中心网点对应平台总包商户网点
|
|
|
+ * @param websitNo 商户售后中心网点编号
|
|
|
+ * @param order 商户工单类别
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public WebsitFWS shshzxwdToptzbwd(String websitNo, OrderBase order){
|
|
|
+ WebsitFWS resultData = new WebsitFWS();
|
|
|
+ if (StringUtils.isEmpty(websitNo)){
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+ // 提取平台的销售网点信息 无信息不处理
|
|
|
+ List<CustomerInformationWebsit> cIWebsitList = customerInformationWebsitService.lambdaQuery()
|
|
|
+ .eq(CustomerInformationWebsit::getRefAfterSaleWebsitId,websitNo).list();
|
|
|
+ if (CollectionUtils.isNotEmpty(cIWebsitList)){
|
|
|
+ if (cIWebsitList.size()==1){
|
|
|
+ // 这里的网点编号也是平台的商户编号
|
|
|
+ resultData.setWebsitId(cIWebsitList.get(0).getWebsitId());
|
|
|
+ resultData.setBrandSysWebsitNumber(cIWebsitList.get(0).getRefSysWebsitNumber());
|
|
|
+ getNameAndHotline(resultData);
|
|
|
+ resultData.setBrandId(cIWebsitList.get(0).getBrandId());
|
|
|
+ resultData.setBrandName(cIWebsitList.get(0).getBrandName());
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+
|
|
|
+ List<CustomerInformationWebsit> ciws = new ArrayList<>();
|
|
|
+ // 看服务商总包商户网点是否服务工单大类
|
|
|
+ for (CustomerInformationWebsit item:cIWebsitList){
|
|
|
+ WebsitServiceCategoryDetail wosinfo = getWebCategory(item.getBrandId(),item.getWebsitId(),order.getMainId(),order.getOrderType());
|
|
|
+ if (wosinfo !=null){
|
|
|
+ ciws.add(item);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(ciws)){
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+ if (ciws.size()==1){
|
|
|
+ resultData.setWebsitId(ciws.get(0).getWebsitId());
|
|
|
+ getNameAndHotline(resultData);
|
|
|
+ resultData.setBrandId(ciws.get(0).getBrandId());
|
|
|
+ resultData.setBrandName(ciws.get(0).getBrandName());
|
|
|
+ resultData.setBrandSysWebsitNumber(ciws.get(0).getRefSysWebsitNumber());
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 多网点时再进行位置过滤
|
|
|
+ CustomerInformationWebsit ci = getCustomerInformationWebsit(websitNo,ciws);
|
|
|
+ if (ci!=null){
|
|
|
+ resultData.setWebsitId(ci.getWebsitId());
|
|
|
+ getNameAndHotline(resultData);
|
|
|
+ resultData.setBrandId(ci.getBrandId());
|
|
|
+ resultData.setBrandName(ci.getBrandName());
|
|
|
+ resultData.setBrandSysWebsitNumber(ci.getRefSysWebsitNumber());
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ return resultData;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 商户售后网点对应平台售后网点
|
|
|
* @param websitNo 商户售后网点编号
|
|
|
* @param order 商户工单大类、商户工单类型
|
|
@@ -1254,7 +1315,8 @@ public class PublicServiceImpl implements PublicService {
|
|
|
@Override
|
|
|
public void getZXINFO(String websitNo, OrderBase order){
|
|
|
WebsitFWS websitFWS = null;
|
|
|
- websitFWS = shshwdToptshwd(websitNo, order);
|
|
|
+ // websitFWS = shshwdToptshwd(websitNo, order);
|
|
|
+ websitFWS = shshzxwdToptzbwd(websitNo, order);
|
|
|
if (StringUtils.isEmpty(websitFWS.getWebsitId())){
|
|
|
websitFWS = shxswdToptxswd(websitNo, order);
|
|
|
}
|