From 7fe320cdede9735243e1436c95463129b7876721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 12 Jul 2022 17:09:52 +0800
Subject: [PATCH] 1

---
 business/q_bida/q_bida_server.go           |  4 ++--
 business/q_bida/withdrawal_record_utils.go | 26 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/business/q_bida/q_bida_server.go b/business/q_bida/q_bida_server.go
index b2febc879..ce6d926b6 100644
--- a/business/q_bida/q_bida_server.go
+++ b/business/q_bida/q_bida_server.go
@@ -162,7 +162,7 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user
 
 	// 添加运单表
 	dao.WrapAddIDCULDEntity(vendorOrder, ctx.GetUserName())
-	if err := dao.CreateEntity(db, vendorOrder); err != nil {
+	if err := dao.CreateEntityTx(tdb, vendorOrder); err != nil {
 		dao.Rollback(db, tdb)
 		return nil, err
 	}
@@ -187,7 +187,7 @@ func CreateWayOrder(ctx *jxcontext.Context, param *model.MakeOrderParamReq, user
 		Address:       "",
 		PayMethod:     0,
 	}
-	if err := dao.CreateEntity(db, orderPayStatus); err != nil {
+	if err := dao.CreateEntityTx(tdb, orderPayStatus); err != nil {
 		dao.Rollback(db, tdb)
 		return nil, err
 	}
diff --git a/business/q_bida/withdrawal_record_utils.go b/business/q_bida/withdrawal_record_utils.go
index ddd61b96f..92b92cca5 100644
--- a/business/q_bida/withdrawal_record_utils.go
+++ b/business/q_bida/withdrawal_record_utils.go
@@ -39,30 +39,30 @@ func SendPayInfo2Ali(payOrder *model.WithdrawalRecord, param *model.AddWithdrawa
 func UpdateUserMoney(payOrder *model.WithdrawalRecord, userBill *model.UserBill) error {
 	// 如果支付成功
 	db := dao.GetDB()
-	//tx, _ := dao.Begin(db)
-	//defer func() {
-	//	if r := recover(); r != nil {
-	//		panic(r)
-	//	}
-	//	dao.Commit(db, tx)
-	//}()
+	tx, _ := dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			panic(r)
+		}
+		dao.Commit(db, tx)
+	}()
 
 	switch payOrder.OrderStatus {
 	case model.WithdrawalRecordPaySuccess:
 		userBill.AccountBalance = userBill.AccountBalance - payOrder.WithdrawalMoney
 		bill := &userBill
-		if _, err := dao.UpdateEntity(db, &bill, "AccountBalance"); err != nil {
+		if _, err := dao.UpdateEntityTx(tx, &bill, "AccountBalance"); err != nil {
 			globals.SugarLogger.Debug("err=======", err)
-			//dao.Rollback(db, tx)
+			dao.Rollback(db, tx)
 			return err
 		}
-		if err := dao.CreateEntity(db, payOrder); err != nil {
-			//	dao.Rollback(db, tx)
+		if err := dao.CreateEntityTx(tx, payOrder); err != nil {
+			dao.Rollback(db, tx)
 			return err
 		}
 	case model.WithdrawalWaitRecord, model.WithdrawalRecordFail, model.WithdrawalRecordPayFail:
-		if err := dao.CreateEntity(db, payOrder); err != nil {
-			//	dao.Rollback(db, tx)
+		if err := dao.CreateEntityTx(tx, payOrder); err != nil {
+			dao.Rollback(db, tx)
 			return err
 		}
 	}