|
@@ -574,9 +574,13 @@ public class PublicServiceImpl implements PublicService {
|
|
if (StringUtils.isEmpty(websitNo)){
|
|
if (StringUtils.isEmpty(websitNo)){
|
|
return resultData;
|
|
return resultData;
|
|
}
|
|
}
|
|
|
|
+ // 提取格力集团信息
|
|
|
|
+ Brand brandRec = baseService.getBrand();
|
|
|
|
+
|
|
// 提取平台的销售网点信息 无信息不处理
|
|
// 提取平台的销售网点信息 无信息不处理
|
|
List<CustomerInformationWebsit> cIWebsitList = customerInformationWebsitService.lambdaQuery()
|
|
List<CustomerInformationWebsit> cIWebsitList = customerInformationWebsitService.lambdaQuery()
|
|
- .eq(CustomerInformationWebsit::getRefWebsitId,websitNo).list();
|
|
|
|
|
|
+ .eq(CustomerInformationWebsit::getRefWebsitId,websitNo)
|
|
|
|
+ .eq(CustomerInformationWebsit::getGroupCompanyId,brandRec.getBrandId()).list();
|
|
if (CollectionUtils.isNotEmpty(cIWebsitList)){
|
|
if (CollectionUtils.isNotEmpty(cIWebsitList)){
|
|
if (cIWebsitList.size()==1){
|
|
if (cIWebsitList.size()==1){
|
|
// 这里的网点编号也是平台的商户编号
|
|
// 这里的网点编号也是平台的商户编号
|