From f727a93931f801bbcd3b5eb0275169cf55a87d5e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 22 九月 2024 22:40:56 +0800
Subject: [PATCH] 1.优惠券-使用条件-根据满减还是无门槛控制 2.商品限购-根据payment_time来控制
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
index 301b0ca..b9dddbe 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
@@ -65,8 +65,9 @@
@PutMapping("/{id}")
@ApiOperation(value = "修改", notes = "修改")
- public ResponseEntity<ReturnDataDTO> update(@Validated @RequestBody CreateCouponTemplatePointDTO dto) {
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable String id,@Validated @RequestBody CreateCouponTemplatePointDTO dto) {
// 信息校验
+ dto.setId(id);
valid(dto);
CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getId());
@@ -75,6 +76,7 @@
}
CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
+ BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO);
BeanUtils.copyProperties(dto, couponTemplateBO);
// 设置成积分优惠券
@@ -153,9 +155,9 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @PutMapping("/batch/expire")
+ @PostMapping("/batch/expire")
@ApiOperation(value = "批量下架", notes = "批量下架")
- public ResponseEntity<ReturnDataDTO> expireBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> expireBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.expireBatchCouponTemplate(dto);
@@ -165,9 +167,9 @@
- @PutMapping("/batch/active")
+ @PostMapping("/batch/active")
@ApiOperation(value = "批量发布", notes = "批量发布")
- public ResponseEntity<ReturnDataDTO> activeBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> activeBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.activeBatchCouponTemplate(dto);
@@ -175,9 +177,9 @@
}
- @DeleteMapping("/batch/del")
+ @PostMapping("/batch/del")
@ApiOperation(value = "批量删除", notes = "批量删除")
- public ResponseEntity<ReturnDataDTO> deleteBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> deleteBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.deleteBatchCouponTemplate(dto);
return returnData(R.SUCCESS.getCode(), null);
@@ -214,11 +216,17 @@
private void valid(CreateCouponTemplatePointDTO dto){
- if (StringUtils.isNotBlank(dto.getCouponDiscountType())
- && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
- && dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0) {
- throw new ValidationException("订单金额不能小于折扣金额");
+ if (StringUtils.isNotBlank(dto.getCouponDiscountType()) && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())) {
+
+ if(dto.getMinOrderAmount().compareTo(BigDecimal.ZERO)<=0){
+ throw new ValidationException("优惠券使用条件不能小于0");
+ }
+ if(dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0){
+ throw new ValidationException("优惠券使用条件不能小于面值金额");
+ }
+
}
+
if (StringUtils.isNotBlank(dto.getCouponDiscountType())
&& dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
&& dto.getCouponDiscountValue().compareTo(BigDecimal.ZERO) <= 0) {
@@ -233,4 +241,15 @@
}
+
+
+
+ @PostMapping("/exchange")
+ @ApiOperation(value = "小程序-积分优惠券兑换", notes = "小程序-积分优惠券兑换")
+ public ResponseEntity<ReturnDataDTO> exchangeCoupon(@Validated @RequestBody ExchangeCouponDTO dto) {
+ couponTemplateService.exchangeCoupon(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+
+
+ }
}
--
Gitblit v1.9.3