Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
7496c5469e
3 измененных файлов: 11 добавлений и 46 удалений
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java
  2. +0
    -42
      mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java
  3. +11
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 0
- 3
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;



+ 0
- 42
mallinkService/src/main/java/com/iformall/enums/EnumRemindDateType.java Просмотреть файл

@@ -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;
}
}

+ 11
- 1
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Просмотреть файл

@@ -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);


Загрузка…
Отмена
Сохранить