From 7496c5469efa0850d955d277db4be9afcfa4a156 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 22 Oct 2019 19:23:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/invest/InvestRemindQuery.java | 3 -- .../iformall/enums/EnumRemindDateType.java | 42 ------------------- .../invest/impl/InvestBizServiceImpl.java | 12 +++++- 3 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java 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 eb03ebe51..7af4329c6 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 @@ -1,6 +1,5 @@ package com.iformall.domain.vo.invest; -import com.iformall.enums.EnumRemindDateType; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,8 +14,6 @@ public class InvestRemindQuery extends InvestPageQuery { */ @io.swagger.annotations.ApiModelProperty(value = "用户", name = "ownerId") private Long ownerId; - @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "dateType") - private EnumRemindDateType dateType; @io.swagger.annotations.ApiModelProperty(value = "预约时间", name = "remindDate",example = "2018-10-01 00:00:00") private Date remindDate; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java deleted file mode 100644 index 51bef7a5f..000000000 --- a/mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.iformall.enums; - -import com.baomidou.mybatisplus.annotation.EnumValue; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * - */ -public enum EnumRemindDateType { - TODAY(0, "今天"), - THREE(1, "近三天"), - WEEK(2, "近一周"), - MONTH(3, "近一个月"), - ; - - public static EnumRemindDateType getEnum(Integer code) { - for (EnumRemindDateType value : values()) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; - } - - @EnumValue - private final Integer code; - private final String info; - - EnumRemindDateType(Integer code, String info) { - this.code = code; - this.info = info; - } - - @JsonValue - public Integer getCode() { - return code; - } - - public String getInfo() { - return info; - } -} 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 2dd366c58..f99786a85 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 @@ -306,7 +306,7 @@ public class InvestBizServiceImpl implements InvestBizService { remindPageQuery.setQueryData(remindQuery); 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())); + //queryWrapper.le(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate); InvestPageResult 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 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 usersMap = getMap(this.queryUserList(null), MallUserInfo::getId); return buildTaskItem(taskEntity, shopVo, usersMap);