From 8999a9a9c5267487f78fbf9ec7868572efd4723c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 14 九月 2024 16:11:41 +0800
Subject: [PATCH] 1.优惠券和优惠券记录表新增优惠券图片字段
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java
index b0d20bc..09721fe 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java
@@ -11,10 +11,7 @@
import com.mzl.flower.dto.response.coupon.CouponTemplatePointVO;
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;
@@ -52,7 +49,7 @@
CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
BeanUtils.copyProperties(dto, couponTemplateBO);
- // 设置成积分优惠券
+ // 设置成活动优惠券
couponTemplateBO.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.ALL.getType());
@@ -65,8 +62,10 @@
@PutMapping("/{id}")
@ApiOperation(value = "修改", notes = "修改")
- public ResponseEntity<ReturnDataDTO> update(@Validated @RequestBody CreateCouponTemplateActivyDTO dto) {
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable String id,@Validated @RequestBody CreateCouponTemplateActivyDTO dto) {
+ // 手动设置id值
+ dto.setId(id);
// 信息验证
valid(dto);
@@ -76,9 +75,10 @@
}
CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
+ BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO);
BeanUtils.copyProperties(dto, couponTemplateBO);
- // 设置成积分优惠券
+ // 设置成活动优惠券
couponTemplateBO.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
couponTemplateBO.setGetUserType(CouponGetUserTypeEnum.ALL.getType());
@@ -109,7 +109,7 @@
@GetMapping("/page")
@ApiOperation(value = "查询-分页", notes = "查询-分页")
public ResponseEntity<ReturnDataDTO<Page<CouponTemplatePointVO>>> page(Page page, QueryCouponDTO dto) {
- // 设置只查询积分优惠券的
+ // 设置只查询活动优惠券的
dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
Page<CouponTemplateVO> resultPage = couponTemplateService.getPage(page, dto);
return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(resultPage, CouponTemplateActivyVO.class));
@@ -118,7 +118,7 @@
@GetMapping("/list")
@ApiOperation(value = "查询-全部", notes = "查询-全部")
public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> list(QueryCouponDTO dto) {
- // 设置只查询积分优惠券的
+ // 设置只查询活动优惠券的
dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getList(dto), CouponTemplateActivyVO.class));
}
@@ -197,6 +197,16 @@
throw new ValidationException("领取后有效时间整数需要大于0");
}
}
+
+ // 用户获取的类型是首页领取的话
+ if(StringUtils.isNotBlank(dto.getGetType()) && dto.getGetType().equals(dto.getGetType().equals(CouponGetTypeEnum.HOME.getType()))
+ ){
+ // 优惠券图片校验
+ if(StringUtils.isBlank(dto.getImageUrl())){
+ throw new ValidationException("优惠券图片不能为空");
+ }
+ }
+
}
}
--
Gitblit v1.9.3