| @@ -4,6 +4,8 @@ import com.iformall.enums.EnumRemindDateType; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import java.util.Date; | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class InvestRemindQuery extends InvestPageQuery { | public class InvestRemindQuery extends InvestPageQuery { | ||||
| @@ -15,5 +17,7 @@ public class InvestRemindQuery extends InvestPageQuery { | |||||
| private Long ownerId; | private Long ownerId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType") | @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType") | ||||
| private EnumRemindDateType dateType; | private EnumRemindDateType dateType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType",example = "2018-10-01 00:00:00") | |||||
| private Date remindDate; | |||||
| } | } | ||||
| @@ -101,7 +101,9 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceIm | |||||
| InvestHelper.notNull(input, "参数"); | InvestHelper.notNull(input, "参数"); | ||||
| InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY); | InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY); | ||||
| ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); | ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); | ||||
| consumer.accept(input); | |||||
| if(consumer!=null) { | |||||
| consumer.accept(input); | |||||
| } | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -15,6 +15,7 @@ import com.iformall.service.WxBrandService; | |||||
| import com.iformall.service.WxRentContractService; | import com.iformall.service.WxRentContractService; | ||||
| import com.iformall.service.WxShopService; | import com.iformall.service.WxShopService; | ||||
| import com.iformall.service.invest.*; | import com.iformall.service.invest.*; | ||||
| import com.iformall.utils.DateUtils; | |||||
| import org.apache.commons.collections.CollectionUtils; | import org.apache.commons.collections.CollectionUtils; | ||||
| import org.apache.commons.collections.MapUtils; | import org.apache.commons.collections.MapUtils; | ||||
| import org.apache.commons.compress.utils.Lists; | import org.apache.commons.compress.utils.Lists; | ||||
| @@ -265,7 +266,10 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| remindQuery.setOwner(params.getOwnerId()); | remindQuery.setOwner(params.getOwnerId()); | ||||
| } | } | ||||
| remindPageQuery.setQueryData(remindQuery); | 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())) { | if (CollectionUtils.isEmpty(recordPage.getRecords())) { | ||||
| return investPage; | return investPage; | ||||
| } | } | ||||
| @@ -299,6 +303,14 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| return investPage; | 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 | @Override | ||||
| public InvestPageResult<InvestMessageEntity> queryPageMessage(InvestMessageQuery params) { | public InvestPageResult<InvestMessageEntity> queryPageMessage(InvestMessageQuery params) { | ||||
| InvestHelper.notNull(params); | InvestHelper.notNull(params); | ||||
| @@ -48,10 +48,12 @@ public class InvestMessageServiceImpl extends InvestBaseServiceImpl<InvestMessag | |||||
| @Override | @Override | ||||
| public boolean removeAll() { | public boolean removeAll() { | ||||
| LambdaUpdateWrapper<InvestMessageEntity> wrapper = new LambdaUpdateWrapper<>(); | |||||
| wrapper.eq(InvestMessageEntity::getTenantId, InvestUserContext.getUser().getTenantId()); | |||||
| wrapper.eq(InvestMessageEntity::getOwner, InvestUserContext.getUserId()); | |||||
| InvestMessageEntity entity = new InvestMessageEntity(); | |||||
| entity.setOwner(InvestUserContext.getUserId()); | |||||
| LambdaUpdateWrapper<InvestMessageEntity> wrapper = new LambdaUpdateWrapper<>(); | |||||
| wrapper.eq(InvestMessageEntity::getTenantId, InvestUserContext.getUser().getTenantId()); | |||||
| wrapper.eq(InvestMessageEntity::getOwner, InvestUserContext.getUserId()); | |||||
| wrapper.set(InvestMessageEntity::getDeleted, 1); | wrapper.set(InvestMessageEntity::getDeleted, 1); | ||||
| return super.update(wrapper); | |||||
| return super.update(null, wrapper); | |||||
| } | } | ||||
| } | } | ||||