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

[招商][预约列表]

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
c4ee9fd52b
4 измененных файлов: 26 добавлений и 6 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestRemindQuery.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
  3. +13
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  4. +6
    -4
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java

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

}

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

@@ -101,7 +101,9 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, 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


+ 13
- 1
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<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);


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

@@ -48,10 +48,12 @@ public class InvestMessageServiceImpl extends InvestBaseServiceImpl<InvestMessag

@Override
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);
return super.update(wrapper);
return super.update(null, wrapper);
}
}

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