caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优惠券活动问题处理

Browse Source
This commit is contained in:
Chopper 2021-06-15 18:10:25 +08:00
parent 5f403ec675
commit 841903d2a6
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
View File

@ -2,9 +2,9 @@ package cn.lili.trigger.executor;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.lili.common.delayqueue.BroadcastMessage; import cn.lili.common.delayqueue.BroadcastMessage;
import cn.lili.common.trigger.interfaces.TimeTriggerExecutor;
import cn.lili.common.trigger.model.TimeExecuteConstant; import cn.lili.common.trigger.model.TimeExecuteConstant;
import cn.lili.modules.broadcast.service.StudioService; import cn.lili.modules.broadcast.service.StudioService;
import cn.lili.trigger.TimeTriggerExecutor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

1
framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
View File

@ -26,7 +26,6 @@ public class CouponActivity extends BasePromotion {
/** /**
* @see CouponActivityTypeEnum * @see CouponActivityTypeEnum
*
*/ */
@NotNull(message = "优惠券活动类型不能为空") @NotNull(message = "优惠券活动类型不能为空")
@ApiModelProperty(value = "优惠券活动类型") @ApiModelProperty(value = "优惠券活动类型")

17
manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
View File

@ -6,20 +6,17 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.PageUtil;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage; 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.dos.CouponActivity;
import cn.lili.modules.promotion.entity.dto.CouponActivityDTO; import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.modules.promotion.entity.vos.CouponActivityVO; import cn.lili.modules.promotion.entity.vos.CouponActivityVO;
import cn.lili.modules.promotion.service.CouponActivityService; import cn.lili.modules.promotion.service.CouponActivityService;
import cn.lili.modules.promotion.service.CouponService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
@ -35,8 +32,6 @@ public class CouponActivityManagerController {
@Autowired @Autowired
private CouponActivityService couponActivityService; private CouponActivityService couponActivityService;
@Autowired
private CouponService couponService;
@ApiOperation(value = "获取优惠券活动分页") @ApiOperation(value = "获取优惠券活动分页")
@GetMapping @GetMapping
@ -53,13 +48,15 @@ public class CouponActivityManagerController {
@ApiOperation(value = "添加优惠券活动") @ApiOperation(value = "添加优惠券活动")
@PostMapping @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)); return ResultUtil.data(couponActivityService.addCouponActivity(couponActivityDTO));
} }
@ApiOperation(value = "修改优惠券活动") @ApiOperation(value = "修改优惠券活动")
@PutMapping("/{id}") @PutMapping("/{id}")
public ResultMessage<CouponActivity> updateCouponActivity(@PathVariable String id, @Validated CouponActivityDTO couponActivityDTO) { public ResultMessage<CouponActivity> updateCouponActivity(@PathVariable String id, CouponActivityDTO couponActivityDTO) {
couponActivityDTO.setId(id); couponActivityDTO.setId(id);
return ResultUtil.data(couponActivityService.updateCouponActivity(couponActivityDTO)); 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());
}
} }