增加了单项订单的接口

2024-07-23 11:41:00 +08:00
parent dfda2e2425
commit 8c84ed3656
24 changed files with 1181 additions and 165 deletions
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"hepa-calc-api/api/dao"
+	"hepa-calc-api/api/dto"
 	"hepa-calc-api/api/model"
 	"hepa-calc-api/api/requests"
 	"hepa-calc-api/api/responses"
@@ -35,18 +36,6 @@ func (r *Login) LoginPhone(c *gin.Context) {

 // LoginWx 微信授权登录
 func (r *Login) LoginWx(c *gin.Context) {
-	userService := service.UserService{}
-	// 处理用户头像
-	avatar, err := userService.HandleUserAvatar("https://thirdwx.qlogo.cn/mmopen/vi_32/dzhWq43iaB5GyJJUbajibSQtIt6d4Y9QPk5ImB1C14fPk6AOtcgaPztUzjKwb9kmPtqNpyCal5cEyw0YyTr1QEbdtHiaOViay4RgSpdm2XaduXA/132")
-	if err != nil {
-		responses.FailWithMessage(err.Error(), c)
-		return
-	}
-
-	fmt.Println(avatar)
-	responses.Ok(c)
-	return
-
 	loginRequest := requests.LoginRequest{}
 	req := loginRequest.LoginWx
 	if err := c.ShouldBind(&req); err != nil {
@@ -87,12 +76,13 @@ func (r *Login) LoginWx(c *gin.Context) {
 		tx := global.Db.Begin()
 		defer func() {
 			if r := recover(); r != nil {
+				fmt.Println(r)
 				tx.Rollback()
 			}
 		}()

-		userService := service.UserService{}
 		// 处理用户头像
+		userService := service.UserService{}
 		avatar, err := userService.HandleUserAvatar(userInfo.HeadImgUrl)
 		if err != nil {
 			tx.Rollback()
@@ -101,7 +91,7 @@ func (r *Login) LoginWx(c *gin.Context) {
 		}

 		// 新增用户
-		user := &model.User{
+		user = &model.User{
 			UserName:         userInfo.Nickname,
 			Mobile:           "",
 			RegisterSource:   req.Source,
@@ -123,10 +113,10 @@ func (r *Login) LoginWx(c *gin.Context) {
 		}

 		// 获取app用户信息
-		var result *string
-		if result == nil {
-			// 新增app用户信息
-		}
+		//var result *string
+		//if result == nil {
+		//	// 新增app用户信息
+		//}

 		tx.Commit()
 	}
@@ -138,10 +128,16 @@ func (r *Login) LoginWx(c *gin.Context) {

 	// 生成jwt
 	jwt, err := token.NewJWT()
-	if err != nil {
+	if err != nil || jwt == "" {
 		responses.FailWithMessage("登陆失败", c)
 		return
 	}

-	responses.OkWithData(jwt, c)
+	// 处理返回值
+	g := dto.LoginWxDto(user)
+
+	// 加载token
+	g.LoadToken(jwt)
+
+	responses.OkWithData(g, c)
 }
@@ -1,13 +1,17 @@
 package controller

 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"hepa-calc-api/api/dao"
 	"hepa-calc-api/api/dto"
 	"hepa-calc-api/api/requests"
 	"hepa-calc-api/api/responses"
+	"hepa-calc-api/api/service"
 	"hepa-calc-api/global"
 	"hepa-calc-api/utils"
+	"strconv"
+	"time"
 )

 type OrderSingle struct{}
@@ -56,3 +60,258 @@ func (b *OrderSingle) GetOrderSinglePage(c *gin.Context) {
 	result["data"] = g
 	responses.OkWithData(result, c)
 }
+
+// AddOrderSingle 创建单项订单
+func (b *OrderSingle) AddOrderSingle(c *gin.Context) {
+	orderSingleRequest := requests.OrderSingleRequest{}
+	req := orderSingleRequest.AddOrderSingle
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	userId := c.GetInt64("UserId")
+
+	// 将 id 转换为 int64 类型
+	questionId, err := strconv.ParseInt(req.QuestionId, 10, 64)
+	if err != nil {
+		responses.Fail(c)
+		return
+	}
+
+	// 用户优惠卷id
+	var userCouponId *int64
+	if req.UserCouponId != "" {
+		id, err := strconv.ParseInt(req.UserCouponId, 10, 64)
+		if err != nil {
+			responses.Fail(c)
+			return
+		}
+
+		userCouponId = &id
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 创建单项订单
+	orderSingleService := service.OrderSingleService{}
+	orderSingle, err := orderSingleService.AddOrderSingle(tx, userId, questionId, userCouponId, req.PayChannel)
+	if err != nil {
+		tx.Rollback()
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	tx.Commit()
+
+	// 处理返回值
+	orderId := fmt.Sprintf("%d", orderSingle.OrderId)
+
+	responses.OkWithData(orderId, c)
+}
+
+// PutCancelOrderSingle 取消单项订单
+func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
+	userId := c.GetInt64("UserId")
+
+	id := c.Param("order_id")
+	if id == "" {
+		responses.FailWithMessage("缺少参数", c)
+		return
+	}
+
+	// 将 id 转换为 int64 类型
+	orderId, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		responses.Fail(c)
+		return
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 取消单项订单
+	orderSingleService := service.OrderSingleService{}
+	res, err := orderSingleService.PutCancelOrderSingle(tx, userId, orderId, 1)
+	if err != nil {
+		tx.Rollback()
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	if res == false {
+		tx.Rollback()
+		responses.FailWithMessage("取消订单失败", c)
+		return
+	}
+
+	tx.Commit()
+	responses.Ok(c)
+}
+
+// GetOrderSinglePay 获取单项订单支付数据
+func (b *OrderSingle) GetOrderSinglePay(c *gin.Context) {
+	orderSingleRequest := requests.OrderSingleRequest{}
+	req := orderSingleRequest.GetOrderSinglePay
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	userId := c.GetInt64("UserId")
+
+	id := c.Param("order_id")
+	if id == "" {
+		responses.FailWithMessage("缺少参数", c)
+		return
+	}
+
+	// 将 id 转换为 int64 类型
+	orderId, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		responses.Fail(c)
+		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
+	}
+
+	// 检测订单状态（1:待支付 2:已完成 3:已取消）
+	if orderSingle.OrderStatus != 1 {
+		responses.FailWithMessage("订单状态异常", c)
+		return
+	}
+
+	// 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+	if orderSingle.PayStatus != 1 {
+		responses.FailWithMessage("订单支付状态异常", c)
+		return
+	}
+
+	// 验证订单过期支付时间
+	now := time.Now()
+	validTime := time.Time(orderSingle.CreatedAt).Add(30 * time.Minute)
+	if validTime.Before(now) {
+		responses.FailWithMessage("订单已过期", c)
+		return
+	}
+
+	// 处理返回值
+	g := dto.GetOrderSinglePayDto(orderSingle)
+
+	// 获取预支付交易会话标识
+	if req.ClientType == 1 {
+		orderSingleService := service.OrderSingleService{}
+		prepay, err := orderSingleService.GetJsapiPrepay(orderSingle)
+		if err != nil {
+			responses.FailWithMessage("发起支付失败", c)
+			return
+		}
+
+		g.PrepayJsapi = prepay
+	} else {
+		orderSingleService := service.OrderSingleService{}
+		prepay, err := orderSingleService.GetAppPrepay(orderSingle)
+		if err != nil {
+			responses.FailWithMessage("发起支付失败", c)
+			return
+		}
+
+		g.PrepayApp = prepay
+	}
+
+	responses.OkWithData(g, c)
+}
+
+// DeleteOrderSingle 删除单项订单支付数据
+func (b *OrderSingle) DeleteOrderSingle(c *gin.Context) {
+	userId := c.GetInt64("UserId")
+
+	id := c.Param("order_id")
+	if id == "" {
+		responses.FailWithMessage("缺少参数", c)
+		return
+	}
+
+	// 将 id 转换为 int64 类型
+	orderId, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		responses.Fail(c)
+		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
+	}
+
+	// 检测订单状态
+	if orderSingle.OrderStatus != 2 {
+		responses.FailWithMessage("订单不允许删除", c)
+		return
+	}
+
+	// 检测订单删除状态
+	if orderSingle.IsDelete == 1 {
+		responses.Ok(c)
+		return
+	}
+
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	orderSingleData := make(map[string]interface{})
+	orderSingleData["is_delete"] = 1
+	orderSingleData["updated_at"] = time.Now().Format("2006-01-02 15:04:05")
+	err = orderSingleDao.EditOrderSingleById(tx, orderId, orderSingleData)
+	if err != nil {
+		tx.Rollback()
+		responses.FailWithMessage("删除失败", c)
+		return
+	}
+
+	tx.Commit()
+	responses.Ok(c)
+}