|
|
|
@@ -306,7 +306,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
remindPageQuery.setQueryData(remindQuery); |
|
|
|
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getBeginDate, getDayStart(params.getRemindDate())); |
|
|
|
queryWrapper.le(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); |
|
|
|
//queryWrapper.le(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); |
|
|
|
queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate); |
|
|
|
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper); |
|
|
|
if (CollectionUtils.isEmpty(recordPage.getRecords())) { |
|
|
|
@@ -483,6 +483,16 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
BeanUtils.copyProperties(shop, shopVo); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//3、商品合同信息 |
|
|
|
Map<Long, WxRentContract> shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId(), "|"), |
|
|
|
InvestUserContext.getUser().getTenantId()); |
|
|
|
WxRentContract contract = shopContractMap.get(shop.getId()); |
|
|
|
if (Objects.nonNull(contract)) { |
|
|
|
shopVo.setStartdate(contract.getRentalStartDate()); |
|
|
|
shopVo.setEnddate(contract.getRentalEndDate()); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
Map<Long, MallUserInfo> usersMap = getMap(this.queryUserList(null), MallUserInfo::getId); |
|
|
|
return buildTaskItem(taskEntity, shopVo, usersMap); |
|
|
|
|