|
|
|
@@ -1239,10 +1239,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
merchantIds.addAll(userMerchantIds); |
|
|
|
} |
|
|
|
} |
|
|
|
String floorRule = StringUtils.trimToNull(record.getFloorForRule()); |
|
|
|
Long building = record.getBuilding(); |
|
|
|
Long floor = record.getFloor(); |
|
|
|
List<Long> floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0); |
|
|
|
|
|
|
|
List<Long> floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor()); |
|
|
|
if(floorMerchantIds != null){ |
|
|
|
if(merchantIds.size() > 0){ |
|
|
|
merchantIds.retainAll(floorMerchantIds); |
|
|
|
@@ -1293,6 +1291,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
// } |
|
|
|
} |
|
|
|
|
|
|
|
private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) { |
|
|
|
String floorRule = StringUtils.trimToNull(floorForRule); |
|
|
|
List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0); |
|
|
|
return floorMerchantIds; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) { |
|
|
|
if (null != floorRule || null != building || null != floor) { |
|
|
|
|