|
|
|
@@ -15,6 +15,7 @@ import com.iformall.service.WxBrandService; |
|
|
|
import com.iformall.service.WxRentContractService; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
import com.iformall.service.invest.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.collections.MapUtils; |
|
|
|
import org.apache.commons.compress.utils.Lists; |
|
|
|
@@ -265,7 +266,10 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
remindQuery.setOwner(params.getOwnerId()); |
|
|
|
} |
|
|
|
remindPageQuery.setQueryData(remindQuery); |
|
|
|
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery); |
|
|
|
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())); |
|
|
|
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper); |
|
|
|
if (CollectionUtils.isEmpty(recordPage.getRecords())) { |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
@@ -299,6 +303,14 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
|
|
|
|
private String getDayEnd(Date date) { |
|
|
|
return DateUtils.format(date) + " 23:59:59"; |
|
|
|
} |
|
|
|
|
|
|
|
private String getDayStart(Date date) { |
|
|
|
return DateUtils.format(date) + " 00:00:00"; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public InvestPageResult<InvestMessageEntity> queryPageMessage(InvestMessageQuery params) { |
|
|
|
InvestHelper.notNull(params); |
|
|
|
|