From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateUserController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateUserController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateUserController.java
index 13d7bd7..7939f58 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateUserController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateUserController.java
@@ -13,14 +13,12 @@
import com.mzl.flower.dto.response.coupon.CouponTemplateUserVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
-import com.mzl.flower.enums.CouponCategoryEnum;
-import com.mzl.flower.enums.CouponGetUserTypeEnum;
-import com.mzl.flower.enums.CouponTypeEnum;
-import com.mzl.flower.enums.CouponUsageTypeEnum;
+import com.mzl.flower.enums.*;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -60,8 +58,8 @@
BeanUtils.copyProperties(dto, couponTemplateBO);
// 设置成指定用户
- couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.POINT.getType());
- // 设置成积分优惠券
+ couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.TARGET.getType());
+ // 设置成用户优惠券
couponTemplateBO.setCategory(CouponCategoryEnum.USER.getStatus());
// 设置默认类型
couponTemplateBO.setUsageType(CouponUsageTypeEnum.GET_AFTER_TIME.getType());
@@ -98,8 +96,8 @@
BeanUtils.copyProperties(dto, couponTemplateBO);
// 设置成指定用户
- couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.POINT.getType());
- // 设置成积分优惠券
+ couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.TARGET.getType());
+ // 设置成用户优惠券
couponTemplateBO.setCategory(CouponCategoryEnum.USER.getStatus());
// 设置默认类型
couponTemplateBO.setUsageType(CouponUsageTypeEnum.GET_AFTER_TIME.getType());
@@ -134,7 +132,7 @@
public ResponseEntity<ReturnDataDTO<Page<CouponTemplatePointVO>>> page(
Page page, QueryCouponDTO dto
) {
- // 设置只查询积分优惠券的
+ // 设置只查询用户优惠券的
dto.setCategory(CouponCategoryEnum.USER.getStatus());
Page<CouponTemplateVO> resultPage = couponTemplateService.getPage(page, dto);
return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(resultPage, CouponTemplateUserVO.class));
@@ -144,7 +142,7 @@
@ApiOperation(value = "查询-全部", notes = "查询-全部")
public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> list(QueryCouponDTO dto
) {
- // 设置只查询积分优惠券的
+ // 设置只查询用户优惠券的
dto.setCategory(CouponCategoryEnum.USER.getStatus());
return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getList(dto), CouponTemplateUserVO.class));
}
@@ -159,6 +157,16 @@
throw new ValidationException("优惠券不存在");
}
+ if(StringUtils.isNotBlank(couponTemplateDO.getStatus())
+ && couponTemplateDO.getStatus().equals(CouponStatusEnum.ACTIVE.getStatus())){
+ throw new ValidationException("已发布的的商品不可重复发布");
+ }
+
+ if(StringUtils.isNotBlank(couponTemplateDO.getStatus())
+ && couponTemplateDO.getStatus().equals(CouponStatusEnum.EXPIRED.getStatus())){
+ throw new ValidationException("已下架的商品不可重复上架");
+ }
+
couponTemplateService.activeCouponTemplate(id);
return returnData(R.SUCCESS.getCode(), null);
--
Gitblit v1.9.3