|
|
|
@@ -1180,9 +1180,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (null == couponMerchantIds || couponMerchantIds.size() <=0 ) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
}else { |
|
|
|
merchantIds.addAll(couponMerchantIds); |
|
|
|
} |
|
|
|
merchantIds.addAll(couponMerchantIds); |
|
|
|
} |
|
|
|
|
|
|
|
String phone = StringUtils.trimToNull(record.getPhone()); |
|
|
|
@@ -1195,8 +1194,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(merchantIds.size() > 0){ |
|
|
|
if(merchantIds.size() > 0){ |
|
|
|
merchantIds.retainAll(userMerchantIds); |
|
|
|
if (merchantIds.size() <= 0) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
merchantIds.addAll(userMerchantIds); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -1204,14 +1209,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
Long building = record.getBuilding(); |
|
|
|
Long floor = record.getFloor(); |
|
|
|
List<Long> floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0); |
|
|
|
if (null == floorMerchantIds || floorMerchantIds.size() <=0 ) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(merchantIds.size() > 0){ |
|
|
|
merchantIds.retainAll(floorMerchantIds); |
|
|
|
if(floorMerchantIds != null){ |
|
|
|
if(merchantIds.size() > 0){ |
|
|
|
merchantIds.retainAll(floorMerchantIds); |
|
|
|
if (merchantIds.size() <= 0) { |
|
|
|
record.setId(-999L); |
|
|
|
return; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
merchantIds.addAll(floorMerchantIds); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// if(EnumProfitSharingUse.YES.getCode().equals(record.getIsUse())){ |
|
|
|
// if(merchantIds.size() > 0){ |
|
|
|
// merchantIds.retainAll(isUseMerchantIds); |
|
|
|
|