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 |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 9817a86..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
@@ -76,6 +76,7 @@
         }
 
         CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
+        BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO);
         BeanUtils.copyProperties(dto, couponTemplateBO);
 
         // 设置成积分优惠券
@@ -215,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) {

--
Gitblit v1.9.3