|
@@ -1,7 +1,7 @@
|
|
package cn.iocoder.yudao.module.promotion.controller.app.combination;
|
|
package cn.iocoder.yudao.module.promotion.controller.app.combination;
|
|
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
|
|
|
|
|
|
+import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordSummaryRespVO;
|
|
import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordSummaryRespVO;
|
|
@@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.validation.constraints.Max;
|
|
import javax.validation.constraints.Max;
|
|
import java.time.Duration;
|
|
import java.time.Duration;
|
|
|
|
+import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
-import java.util.Date;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
@@ -58,7 +58,7 @@ public class AppCombinationRecordController {
|
|
record.setId((long) i);
|
|
record.setId((long) i);
|
|
record.setNickname("用户" + i);
|
|
record.setNickname("用户" + i);
|
|
record.setAvatar("头像" + i);
|
|
record.setAvatar("头像" + i);
|
|
- record.setExpireTime(new Date());
|
|
|
|
|
|
+ record.setExpireTime(LocalDateTime.now());
|
|
record.setUserSize(10);
|
|
record.setUserSize(10);
|
|
record.setUserCount(i);
|
|
record.setUserCount(i);
|
|
record.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
|
|
record.setPicUrl("https://static.iocoder.cn/mall/a79f5d2ea6bf0c3c11b2127332dfe2df.jpg");
|
|
@@ -79,7 +79,7 @@ public class AppCombinationRecordController {
|
|
headRecord.setId(1L);
|
|
headRecord.setId(1L);
|
|
headRecord.setNickname("用户" + 1);
|
|
headRecord.setNickname("用户" + 1);
|
|
headRecord.setAvatar("头像" + 1);
|
|
headRecord.setAvatar("头像" + 1);
|
|
- headRecord.setExpireTime(DateUtils.addTime(Duration.ofDays(1)));
|
|
|
|
|
|
+ headRecord.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(1)));
|
|
headRecord.setUserSize(10);
|
|
headRecord.setUserSize(10);
|
|
headRecord.setUserCount(3);
|
|
headRecord.setUserCount(3);
|
|
headRecord.setStatus(1);
|
|
headRecord.setStatus(1);
|
|
@@ -94,7 +94,7 @@ public class AppCombinationRecordController {
|
|
record.setId((long) i);
|
|
record.setId((long) i);
|
|
record.setNickname("用户" + i);
|
|
record.setNickname("用户" + i);
|
|
record.setAvatar("头像" + i);
|
|
record.setAvatar("头像" + i);
|
|
- record.setExpireTime(new Date());
|
|
|
|
|
|
+ record.setExpireTime(LocalDateTime.now());
|
|
record.setUserSize(10);
|
|
record.setUserSize(10);
|
|
record.setUserCount(i);
|
|
record.setUserCount(i);
|
|
record.setStatus(1);
|
|
record.setStatus(1);
|