|
|
|
@@ -553,8 +553,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (CollectionUtils.isNotEmpty(shops)) { |
|
|
|
Collection<Long> shopPointIds = buildShopContractQuery(shops, EnumRentShopType.POINT); |
|
|
|
Collection<Long> shopIds = buildShopContractQuery(shops, EnumRentShopType.SHOP); |
|
|
|
shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, StringUtils.join(shopIds, "|"), |
|
|
|
InvestUserContext.getUser().getTenantId()); |
|
|
|
shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, StringUtils.join(shopIds, "|")); |
|
|
|
} |
|
|
|
for (WxShop shop : shops) { |
|
|
|
WxRentContract contract = shopContractMap.get(shop.getId()); |
|
|
|
@@ -767,7 +766,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
WxShop shop = shopService.getById(shopId); |
|
|
|
InvestHelper.notNull(shop, "shop 不存在"); |
|
|
|
//3、商品合同信息 |
|
|
|
Map<Long, WxRentContract> shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId()), InvestUserContext.getUser().getTenantId()); |
|
|
|
Map<Long, WxRentContract> shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId())); |
|
|
|
WxRentContract contract = shopContractMap.get(shop.getId()); |
|
|
|
InvestHelper.notNull(contract, "合同信息不存在"); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
@@ -918,8 +917,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (Objects.isNull(shop)) { |
|
|
|
return new HashMap<>(); |
|
|
|
} |
|
|
|
return rentContractService.selectRentContractByShopIds(Collections.singletonList(shop.getId()), StringUtils.join(shop.getId(), ""), |
|
|
|
InvestUserContext.getUser().getTenantId()); |
|
|
|
return rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId(), "")); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|