From 841903d2a63884d6ea87d75369490f6eadca1a85 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 15 Jun 2021 18:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/BroadcastTimeTriggerExecutor.java  |  2 +-
 .../promotion/entity/dos/CouponActivity.java    |  1 -
 .../CouponActivityManagerController.java        | 17 ++++-------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
index 0bc67f6c..ab42b58b 100644
--- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
+++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
@@ -2,9 +2,9 @@ package cn.lili.trigger.executor;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.delayqueue.BroadcastMessage;
-import cn.lili.common.trigger.interfaces.TimeTriggerExecutor;
 import cn.lili.common.trigger.model.TimeExecuteConstant;
 import cn.lili.modules.broadcast.service.StudioService;
+import cn.lili.trigger.TimeTriggerExecutor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
index 26c781a9..bec05f38 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
@@ -26,7 +26,6 @@ public class CouponActivity extends BasePromotion {
 
     /**
      * @see CouponActivityTypeEnum
-     *
      */
     @NotNull(message = "优惠券活动类型不能为空")
     @ApiModelProperty(value = "优惠券活动类型")
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
index 1c99078d..859db064 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
@@ -6,20 +6,17 @@ import cn.lili.common.exception.ServiceException;
 import cn.lili.common.utils.PageUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.CouponActivity;
 import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
 import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
 import cn.lili.modules.promotion.entity.vos.CouponActivityVO;
 import cn.lili.modules.promotion.service.CouponActivityService;
-import cn.lili.modules.promotion.service.CouponService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -35,8 +32,6 @@ public class CouponActivityManagerController {
 
     @Autowired
     private CouponActivityService couponActivityService;
-    @Autowired
-    private CouponService couponService;
 
     @ApiOperation(value = "获取优惠券活动分页")
     @GetMapping
@@ -53,13 +48,15 @@ public class CouponActivityManagerController {
 
     @ApiOperation(value = "添加优惠券活动")
     @PostMapping
-    public ResultMessage<CouponActivity> addCouponActivity(@Validated CouponActivityDTO couponActivityDTO) {
+    @PutMapping(consumes = "application/json", produces = "application/json")
+    public ResultMessage<CouponActivity> addCouponActivity(@RequestBody CouponActivityDTO couponActivityDTO) {
+        couponActivityDTO.setPromotionStatus(PromotionStatusEnum.NEW.name());
         return ResultUtil.data(couponActivityService.addCouponActivity(couponActivityDTO));
     }
 
     @ApiOperation(value = "修改优惠券活动")
     @PutMapping("/{id}")
-    public ResultMessage<CouponActivity> updateCouponActivity(@PathVariable String id, @Validated CouponActivityDTO couponActivityDTO) {
+    public ResultMessage<CouponActivity> updateCouponActivity(@PathVariable String id, CouponActivityDTO couponActivityDTO) {
         couponActivityDTO.setId(id);
         return ResultUtil.data(couponActivityService.updateCouponActivity(couponActivityDTO));
     }
@@ -78,10 +75,4 @@ public class CouponActivityManagerController {
     }
 
 
-    @ApiOperation(value = "获取活动优惠券列表")
-    @GetMapping("/activityCoupons")
-    public ResultMessage<IPage<Coupon>> activityCoupons() {
-        return ResultUtil.data(couponService.activityCoupons());
-    }
-
 }