记得上下班打卡 | git大法好,push需谨慎

Commit aa934f36 authored by jiangxiulong's avatar jiangxiulong

开始结束时间类型

parent 2bb1eb8f
...@@ -45,10 +45,10 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable { ...@@ -45,10 +45,10 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
private Integer timeType; private Integer timeType;
@ApiModelProperty(value = "如果活动有时间限制 开始时间") @ApiModelProperty(value = "如果活动有时间限制 开始时间")
private LocalDateTime startTime; private String startTime;
@ApiModelProperty(value = "如果活动有时间限制 结束时间") @ApiModelProperty(value = "如果活动有时间限制 结束时间")
private LocalDateTime endTime; private String endTime;
@ApiModelProperty(value = "快递费用类型 1包邮 2到付") @ApiModelProperty(value = "快递费用类型 1包邮 2到付")
private Integer expressFeeType; private Integer expressFeeType;
...@@ -88,8 +88,8 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable { ...@@ -88,8 +88,8 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
this.setActivityType(source.getActivityType()); this.setActivityType(source.getActivityType());
this.setActivityNum(source.getActivityNum()); this.setActivityNum(source.getActivityNum());
this.setTimeType(source.getTimeType()); this.setTimeType(source.getTimeType());
this.setStartTime(source.getStartTime()); this.setStartTime(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getStartTime()));
this.setEndTime(source.getEndTime()); this.setEndTime(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getEndTime()));
this.setExpressFeeType(source.getExpressFeeType()); this.setExpressFeeType(source.getExpressFeeType());
this.setActivityRules(source.getActivityRules()); this.setActivityRules(source.getActivityRules());
this.setIsOnline(source.getIsOnline()); this.setIsOnline(source.getIsOnline());
......
...@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.adam.dto.AdamMemberCodeExcelDto;
import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityService; import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityService;
import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil; import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil;
import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils; import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.stone.entity.StoneScoreItems;
import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto; import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam; import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam;
import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam; import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam;
...@@ -30,7 +28,6 @@ import org.springframework.stereotype.Service; ...@@ -30,7 +28,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment