From c4ee9fd52b463f55ec69b28ff868f843905c835f Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 21 Oct 2019 13:21:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/invest/InvestRemindQuery.java | 4 ++++ .../service/invest/impl/InvestBaseServiceImpl.java | 4 +++- .../service/invest/impl/InvestBizServiceImpl.java | 14 +++++++++++++- .../invest/impl/InvestMessageServiceImpl.java | 10 ++++++---- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java index 276dd1dc2..a76b0802c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java @@ -4,6 +4,8 @@ import com.iformall.enums.EnumRemindDateType; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + @Data @EqualsAndHashCode(callSuper = true) public class InvestRemindQuery extends InvestPageQuery { @@ -15,5 +17,7 @@ public class InvestRemindQuery extends InvestPageQuery { private Long ownerId; @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType") private EnumRemindDateType dateType; + @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType",example = "2018-10-01 00:00:00") + private Date remindDate; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 6a447c408..fc86ddeb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -101,7 +101,9 @@ public class InvestBaseServiceImpl, T> extends ServiceIm InvestHelper.notNull(input, "参数"); InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY); ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); - consumer.accept(input); + if(consumer!=null) { + consumer.accept(input); + } } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 808cd8598..cf494a580 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -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 recordPage = remindService.queryPage(remindPageQuery); + LambdaQueryWrapper 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 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 queryPageMessage(InvestMessageQuery params) { InvestHelper.notNull(params); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java index 18b1dc6b0..2d58551c4 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java @@ -48,10 +48,12 @@ public class InvestMessageServiceImpl extends InvestBaseServiceImpl 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 wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(InvestMessageEntity::getTenantId, InvestUserContext.getUser().getTenantId()); + wrapper.eq(InvestMessageEntity::getOwner, InvestUserContext.getUserId()); wrapper.set(InvestMessageEntity::getDeleted, 1); - return super.update(wrapper); + return super.update(null, wrapper); } }