From 979769669f51fc8d8e83364b4482b9e70376a331 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 2 Aug 2022 17:21:08 +0800
Subject: [PATCH] pay

---
 business/jxstore/cms/order.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go
index 6d07eec32..7fbb26d9e 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -3,6 +3,7 @@ package cms
 import (
 	"fmt"
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
+	"github.com/astaxie/beego/client/orm"
 	"strings"
 	"time"
 
@@ -86,6 +87,7 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType, app
 		return nil, err
 	}
 	var (
+		txDB  orm.TxOrmer
 		db    = dao.GetDB()
 		order = &model.Order{
 			OrderID:  orderID,
@@ -118,22 +120,22 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType, app
 		}
 	}
 	globals.SugarLogger.Debug("检验初始数据情况", order.OrderID, order.PayPrice, order.PayMethod)
-	txdb, _ := dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
-			panic(r)
-		}
-	}()
+	//txDB, _ := dao.Begin(db)
+	//defer func() {
+	//	if r := recover(); r != nil {
+	//		panic(r)
+	//	}
+	//}()
 	//微信支付实际金额更新到数据库
-	if _, err := dao.UpdateEntityTx(txdb, &order, "PayPrice"); err != nil {
-		dao.Rollback(db, txdb)
+	if _, err := dao.UpdateEntityTx(txDB, &order); err != nil {
+		//dao.Rollback(db, txDB)
 		return nil, err
 	}
-	if _, err := dao.UpdateEntityTx(txdb, &order, "PayMethod"); err != nil {
-		dao.Rollback(db, txdb)
-		return nil, err
-	}
-	dao.Commit(db, txdb)
+	//if _, err := dao.UpdateEntityTx(txDB, &order, "PayMethod"); err != nil {
+	//	dao.Rollback(db, txDB)
+	//	return nil, err
+	//}
+	//dao.Commit(db, txDB)
 	globals.SugarLogger.Debug("经过更新操作后的数据after=========================", order.OrderID, order.PayPrice, order.PayMethod)
 	globals.SugarLogger.Debugf("pay begin……")
 	err = dao.GetEntity(db, order, "OrderID")