From 4162fb528c390b5e402e801475a3786bd9c22eb2 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 2 Sep 2024 16:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/OrderMember.go | 7 ++++++-
 api/controller/OrderSingle.go | 5 +++++
 api/requests/OrderMember.go   | 8 ++++----
 api/service/OrderMember.go    | 4 ++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/api/controller/OrderMember.go b/api/controller/OrderMember.go
index f92d1a5..6f474d6 100644
--- a/api/controller/OrderMember.go
+++ b/api/controller/OrderMember.go
@@ -97,7 +97,12 @@ func (b *OrderMember) AddOrderMember(c *gin.Context) {
 		userCouponId = &id
 	}
 
-	if req.OrderPrice < 0 {
+	if req.OrderPrice == nil {
+		responses.FailWithMessage("订单金额错误", c)
+		return
+	}
+
+	if *req.OrderPrice < 0 {
 		responses.FailWithMessage("价格错误", c)
 		return
 	}
diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go
index d645621..7bf08b4 100644
--- a/api/controller/OrderSingle.go
+++ b/api/controller/OrderSingle.go
@@ -97,6 +97,11 @@ func (b *OrderSingle) AddOrderSingle(c *gin.Context) {
 		userCouponId = &id
 	}
 
+	if req.OrderPrice == nil {
+		responses.FailWithMessage("订单金额错误", c)
+		return
+	}
+
 	if *req.OrderPrice < 0 {
 		responses.FailWithMessage("价格错误", c)
 		return
diff --git a/api/requests/OrderMember.go b/api/requests/OrderMember.go
index 9e9235f..27c904b 100644
--- a/api/requests/OrderMember.go
+++ b/api/requests/OrderMember.go
@@ -23,10 +23,10 @@ type GetOrderMemberPage struct {
 
 // AddOrderMember 创建会员订单
 type AddOrderMember struct {
-	SystemMemberId string  `json:"system_member_id" form:"system_member_id" label:"会员" validate:"required"`
-	UserCouponId   string  `json:"user_coupon_id" form:"user_coupon_id" label:"优惠卷"`
-	PayChannel     int     `json:"pay_channel" form:"pay_channel" label:"支付渠道" validate:"required,oneof=1 2"` // 支付渠道（1:h5支付 2:app支付）
-	OrderPrice     float64 `json:"order_price"  form:"order_price" label:"订单金额" validate:"required"`          // 订单金额
+	SystemMemberId string   `json:"system_member_id" form:"system_member_id" label:"会员" validate:"required"`
+	UserCouponId   string   `json:"user_coupon_id" form:"user_coupon_id" label:"优惠卷"`
+	PayChannel     int      `json:"pay_channel" form:"pay_channel" label:"支付渠道" validate:"required,oneof=1 2"` // 支付渠道（1:h5支付 2:app支付）
+	OrderPrice     *float64 `json:"order_price"  form:"order_price" label:"订单金额"`                              // 订单金额
 }
 
 // GetOrderMemberPay 获取会员订单支付数据
diff --git a/api/service/OrderMember.go b/api/service/OrderMember.go
index 5199fa4..430878c 100644
--- a/api/service/OrderMember.go
+++ b/api/service/OrderMember.go
@@ -21,7 +21,7 @@ type OrderMemberService struct {
 }
 
 // AddOrderMember 创建会员订单
-func (r *OrderMemberService) AddOrderMember(tx *gorm.DB, UserId, SystemMemberId int64, UserCouponId *int64, payChannel int, orderPrice float64) (orderMember *model.OrderMember, err error) {
+func (r *OrderMemberService) AddOrderMember(tx *gorm.DB, UserId, SystemMemberId int64, UserCouponId *int64, payChannel int, orderPrice *float64) (orderMember *model.OrderMember, err error) {
 	// 检测并发请求
 	redisKey := "AddOrderMember" + fmt.Sprintf("%d", UserId) + fmt.Sprintf("%d", SystemMemberId)
 	res, _ := global.Redis.Get(context.Background(), redisKey).Result()
@@ -116,7 +116,7 @@ func (r *OrderMemberService) AddOrderMember(tx *gorm.DB, UserId, SystemMemberId
 		return nil, errors.New("价格异常")
 	}
 
-	if orderPrice != paymentAmountTotal {
+	if *orderPrice != paymentAmountTotal {
 		return nil, errors.New("价格异常")
 	}