Merge branch 'main' of https://gitea-net.fontree.cn/fiee/fonchain-fiee

pkg/service/bundle/pay.go

@@ -30,8 +30,6 @@ func CreateStripeCheckoutSession(c *gin.Context) {
 	// 获取 用户信息
 	userInfo := login.GetUserInfoFromC(c)
 
-	fmt.Println("userInfo.ID:", userInfo.ID)
-
 	// 检查 订单信息
 	detail, detailErr := service.BundleProvider.OrderRecordsDetail(context.Background(), &bundle.OrderRecordsDetailRequest{
 		OrderNo: req.OutTradeNo,
@@ -42,7 +40,7 @@ func CreateStripeCheckoutSession(c *gin.Context) {
 		return
 	}
 
-	fmt.Printf("detail: %+v\n", detail)
+	fmt.Println("detail.OrderRecord.CustomerID :", detail.OrderRecord.CustomerID)
 
 	// 判断 是否是 本人操作
 	if strconv.FormatUint(userInfo.ID, 10) != detail.OrderRecord.CustomerID {
@@ -50,12 +48,19 @@ func CreateStripeCheckoutSession(c *gin.Context) {
 		return
 	}
 
+	fmt.Println("detail.OrderRecord.TotalAmount :", detail.OrderRecord.TotalAmount)
+	fmt.Println("req.ProductAllPrice :", req.ProductAllPrice)
+
 	//金额校验
 	if detail.OrderRecord.TotalAmount*100 != float32(req.ProductAllPrice) {
 		service.Error(c, errors.New(common.InvalidOrderAmount))
 		return
 	}
 
+	fmt.Println("detail.OrderRecord.Status :", detail.OrderRecord.Status)
+	fmt.Println("detail.OrderRecord.CheckoutSessionId :", detail.OrderRecord.CheckoutSessionId)
+	fmt.Println("detail.OrderRecord.PayTime :", detail.OrderRecord.PayTime)
+
 	// 如果 当前订单 是 已签未支付  且 存在 checkoutSessionId 需要 查询 支付结果
 	if detail.OrderRecord.Status == bundleModel.OrderSigned && detail.OrderRecord.CheckoutSessionId != "" && detail.OrderRecord.PayTime == "" {
 		// 查询支付结果
@@ -98,6 +103,9 @@ func CreateStripeCheckoutSession(c *gin.Context) {
 		return
 	}
 
+	fmt.Println("result.CheckoutSessionId :", result.CheckoutSessionId)
+	fmt.Println("result.CheckoutSessionUrl :", result.CheckoutSessionUrl)
+
 	//更新订单状态
 	_, updateOrderRecordErr := service.BundleProvider.UpdateOrderRecord(context.Background(), &bundle.OrderRecord{
 		Uuid:               detail.OrderRecord.Uuid,