修正了取消订单等操作

api/controller/OrderSingle.go

@@ -97,20 +97,6 @@ func (b *OrderSingle) AddOrderSingle(c *gin.Context) {
 		userCouponId = &id
 	}
 
-	// 获取用户数据
-	userDao := dao.UserDao{}
-	user, err := userDao.GetUserById(userId)
-	if err != nil || user == nil {
-		responses.FailWithMessage("用户错误", c)
-		return
-	}
-
-	// 检测是否会员
-	if req.PayChannel == 3 && user.IsMember == 0 {
-		responses.FailWithMessage("非法操作", c)
-		return
-	}
-
 	if req.OrderPrice < 0 {
 		responses.FailWithMessage("价格错误", c)
 		return
@@ -158,6 +144,17 @@ func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
 		return
 	}
 
+	// 获取订单数据
+	orderSingleDao := dao.OrderSingleDao{}
+	maps := make(map[string]interface{})
+	maps["user_id"] = userId
+	maps["order_id"] = orderId
+	orderSingle, err := orderSingleDao.GetOrderSingle(maps)
+	if err != nil {
+		responses.FailWithMessage("订单异常", c)
+		return
+	}
+
 	// 开始事务
 	tx := global.Db.Begin()
 	defer func() {
@@ -168,7 +165,7 @@ func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
 
 	// 取消单项订单
 	orderSingleService := service.OrderSingleService{}
-	res, err := orderSingleService.CancelOrderSingle(tx, userId, orderId, 1)
+	res, err := orderSingleService.CancelOrderSingle(tx, orderSingle, 1)
 	if err != nil {
 		tx.Rollback()
 		responses.FailWithMessage(err.Error(), c)