Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
97b8fcb539
1 changed files with 27 additions and 3 deletions
  1. +27
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 27
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -1251,7 +1251,15 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return;
}
}else{
merchantIds.addAll(userMerchantIds);
if (merchantIds.size() > 0) {
merchantIds.retainAll(userMerchantIds);
}else {
merchantIds.addAll(userMerchantIds);
}
if (merchantIds.size() <= 0 ) {
record.setId(-999L);
return;
}
}
}
@@ -1264,7 +1272,15 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return;
}
}else{
merchantIds.addAll(floorMerchantIds);
if (merchantIds.size() > 0) {
merchantIds.retainAll(floorMerchantIds);
}else {
merchantIds.addAll(floorMerchantIds);
}
if (merchantIds.size() <= 0 ) {
record.setId(-999L);
return;
}
}
}
@@ -1278,7 +1294,15 @@ public class WxMerchantServiceImpl implements WxMerchantService {
record.setId(-999L);
return;
}else {
merchantIds.addAll(shopMerchantIds);
if (merchantIds.size() > 0) {
merchantIds.retainAll(shopMerchantIds);
}else {
merchantIds.addAll(shopMerchantIds);
}
if (merchantIds.size() <= 0 ) {
record.setId(-999L);
return;
}
}
}



Loading…
Cancel
Save