处理会员订单支付成功

api/controller/CallBack.go

@@ -239,38 +239,12 @@ func (r *CallBack) WxPayMember(c *gin.Context) {
 
 	// 处理支付成功情况
 	if wxResult.OrderStatus == 2 {
-		// 完成未支付单项订单
-		orderSingleService := service.OrderSingleService{}
-		res, err := orderSingleService.CompleteUnPayOrderSingle(tx, orderMember.UserId)
-		if err != nil || res == false {
-			tx.Rollback()
-			c.JSON(http.StatusInternalServerError, gin.H{"code": "ERROR", "message": err})
-			return
-		}
-
-		// 处理用户会员过期时间
-		// 获取订单配置
-		systemMemberDao := dao.SystemMemberDao{}
-		systemMember, err := systemMemberDao.GetSystemMemberById(orderMember.SystemMemberId)
+		// 处理会员订单支付成功
+		orderMemberService := service.OrderMemberService{}
+		err := orderMemberService.HandleOrderMemberPaySuccess(tx, orderMember, user)
 		if err != nil {
 			tx.Rollback()
-			c.JSON(http.StatusInternalServerError, gin.H{"code": "ERROR", "message": "会员配置错误"})
-			return
-		}
-
-		userService := service.UserService{}
-		res = userService.AddUserMemberValidDate(tx, user, int(systemMember.MemberDays))
-		if res == false {
-			tx.Rollback()
-			c.JSON(http.StatusInternalServerError, gin.H{"code": "ERROR", "message": "增加用户会员到期时间失败"})
-			return
-		}
-
-		// 增加用户会员购买次数
-		res, err = userService.AddUserMemberBuyCount(tx, user.UserId)
-		if err != nil || res == false {
-			tx.Rollback()
-			c.JSON(http.StatusInternalServerError, gin.H{"code": "ERROR", "message": "增加用户会员到期时间失败"})
+			c.JSON(http.StatusInternalServerError, gin.H{"code": "ERROR", "message": err.Error()})
 			return
 		}
 	}