From 7dbab928bb7864f808920713e422c59af1a5434c Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 6 Jun 2024 14:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=EF=BC=8C=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=A3=80=E6=B5=8B=E6=98=AF=E5=90=A6=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service/coupon.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/api/service/coupon.go b/api/service/coupon.go
index b59bcf2..192da62 100644
--- a/api/service/coupon.go
+++ b/api/service/coupon.go
@@ -73,6 +73,10 @@ func (r *CouponService) AddSystemCoupon(req requests.AddSystemCoupon) (bool, err
 			if *req.WithAmount == 0 {
 				return false, errors.New("请填入符合满减标准金额")
 			}
+
+			if *req.WithAmount > *req.CouponPrice {
+				return false, errors.New("满减标准金额不可超过优惠卷金额")
+			}
 		}
 
 		// 数量
@@ -571,14 +575,15 @@ func (r *CouponService) GrantSystemCoupon(couponId, adminUserId int64, req reque
 	// 检测用户是否已领取该优惠卷
 	userCouponDao := dao.UserCouponDao{}
 
-	maps = make(map[string]interface{})
-	maps["user_id"] = user.UserId
-	maps["coupon_id"] = coupon.CouponId
-	maps["user_coupon_status"] = 0
-	userCoupons, _ := userCouponDao.GetUserCouponList(maps)
-	if len(userCoupons) >= req.SingleQuantity {
-		return false, errors.New("用户已有该优惠卷")
-	}
+	//// 废弃，不进行检测是否已发放
+	//maps = make(map[string]interface{})
+	//maps["user_id"] = user.UserId
+	//maps["coupon_id"] = coupon.CouponId
+	//maps["user_coupon_status"] = 0
+	//userCoupons, _ := userCouponDao.GetUserCouponList(maps)
+	//if len(userCoupons) >= req.SingleQuantity {
+	//	return false, errors.New("用户已有该优惠卷")
+	//}
 
 	// 开始事务
 	tx := global.Db.Begin()