From 10dbed04b6010531be63690cf187c276a3c1ef8b Mon Sep 17 00:00:00 2001 From: lifenlong Date: Sun, 13 Jun 2021 16:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/PromotionEverydayExecute.java | 2 +- .../order/order/entity/dto/ExcelDTO.java | 21 ------------------- .../modules/promotion/entity/dos/Seckill.java | 7 +++---- .../promotion/service/SeckillService.java | 6 ++++++ .../serviceimpl/SeckillServiceImpl.java | 18 ++++++++++++++++ .../promotion/SeckillManagerController.java | 13 ++++-------- 6 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 framework/src/main/java/cn/lili/modules/order/order/entity/dto/ExcelDTO.java diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index 9804989f..e75dac32 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -98,7 +98,7 @@ public class PromotionEverydayExecute implements EveryDayExecute { private void addSeckill() { Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name()); SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class); - Seckill seckill = new Seckill(seckillSetting.getHours(), seckillSetting.getSeckillRule()); + Seckill seckill = new Seckill(30,seckillSetting.getHours(), seckillSetting.getSeckillRule()); seckillService.saveSeckill(seckill); } diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ExcelDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ExcelDTO.java deleted file mode 100644 index 4a4745d3..00000000 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ExcelDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.lili.modules.order.order.entity.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author liushuai(liushuai711 @ gmail.com) - * @version v4.1 - * @Description: - * @since 2021/6/13 2:37 下午 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ExcelDTO { - - private String sn; - private String logisticsName; - private String logisticsNo; -} diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java index 65c7fe55..2f00487e 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java @@ -54,9 +54,9 @@ public class Seckill extends BasePromotion { @ApiModelProperty(value = "商品数量") private Integer goodsNum; - public Seckill(String hours,String seckillRule){ - //默认创建30天后的秒杀活动 - DateTime dateTime= DateUtil.beginOfDay(DateUtil.offset(new DateTime(), DateField.DAY_OF_YEAR, 30)); + public Seckill(int day,String hours,String seckillRule){ + //默认创建*天后的秒杀活动 + DateTime dateTime= DateUtil.beginOfDay(DateUtil.offset(new DateTime(), DateField.DAY_OF_YEAR, day)); this.applyEndTime=dateTime; this.hours=hours; this.seckillRule=seckillRule; @@ -70,6 +70,5 @@ public class Seckill extends BasePromotion { setEndTime(DateUtil.endOfDay(dateTime)); setPromotionStatus(PromotionStatusEnum.NEW.name()); - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java index 729d0a72..27fdc908 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java @@ -42,6 +42,12 @@ public interface SeckillService extends IService { */ SeckillVO getSeckillByIdFromMongo(String id); + /** + * 初始化秒杀活动，默认开启三十天的秒杀活动 + * + * @return 是否保存成功 + */ + void init(); /** * 保存秒杀活动 * diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index 426bf3d2..a0257615 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -26,6 +26,10 @@ import cn.lili.modules.promotion.service.SeckillApplyService; import cn.lili.modules.promotion.service.SeckillService; import cn.lili.modules.promotion.tools.PromotionTools; import cn.lili.modules.search.service.EsGoodsIndexService; +import cn.lili.modules.system.entity.dos.Setting; +import cn.lili.modules.system.entity.dto.SeckillSetting; +import cn.lili.modules.system.entity.enums.SettingEnum; +import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -33,6 +37,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.gson.Gson; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -71,6 +76,9 @@ public class SeckillServiceImpl extends ServiceImpl impl //秒杀申请 @Autowired private SeckillApplyService seckillApplyService; + //设置 + @Autowired + private SettingService settingService; @Override public IPage getSeckillByPageFromMysql(SeckillSearchParams queryParam, PageVO pageVo) { @@ -100,6 +108,16 @@ public class SeckillServiceImpl extends ServiceImpl impl return this.checkSeckillExist(id); } + @Override + public void init() { + Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name()); + SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class); + for (int i=1;i<=30;i++){ + Seckill seckill = new Seckill(i,seckillSetting.getHours(), seckillSetting.getSeckillRule()); + this.saveSeckill(seckill); + } + } + @Override public boolean saveSeckill(Seckill seckill) { diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java index 454d1d14..2235db88 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java @@ -35,15 +35,10 @@ public class SeckillManagerController { private SeckillApplyService seckillApplyService; - @ApiOperation(value = "添加秒杀活动") - @PostMapping - public ResultMessage addSeckill(SeckillVO seckillVO) { - AuthUser currentUser = UserContext.getCurrentUser(); - seckillVO.setStoreId(currentUser.getId()); - seckillVO.setStoreName(currentUser.getUsername()); - seckillVO.setSeckillApplyStatus(SeckillApplyStatusEnum.NOT_APPLY.name()); - seckillService.saveSeckill(seckillVO); - return ResultUtil.data(seckillVO); + @ApiOperation(value = "添加秒杀活动(初始化方法，默认初始化30天内的活动）") + @GetMapping + public void addSeckill() { + seckillService.init(); }