From 61a994023d82836d33f1668c1ad1114fb9734dde Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Thu, 4 Aug 2022 17:25:19 +0800
Subject: [PATCH 1/2] pay

---
 business/jxstore/cms/order.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go
index fb93e9c5a..8642de22b 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -195,23 +195,29 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, isChoose, payType int,
 				}
 			}()
 			//增加账单 余额减去相应金额
-			//flag := -1
 			globals.SugarLogger.Debug("增加账单 余额减去相应金额")
 			money := userBill.AccountBalance - orderInfo.PayPrice
 			if err = dao.UpdateUserBill(userBill.UserID, money); err != nil {
 				return nil, "余额支付失败", err
 			}
-			//else {
-			//	flag = 1 //支付成功
-			//}
 			//更新订单状态
 			globals.SugarLogger.Debug("更新order状态")
 			//temp_method := 1
 			//temp_status := 110
-			if _, err := dao.SetOrderStatus(txDB, orderInfo.PayPrice, 1, 110, orderID); err != nil {
+			orderInfo.PayMethod = 1
+			orderInfo.Status = 110
+			if _, err := dao.UpdateEntityTx(txDB, orderInfo, "PayMethod"); err != nil {
 				dao.Rollback(db, txDB)
-				return nil, "更新order状态失败", err
+				return nil, "更新order.PayMethod状态失败", err
 			}
+			if _, err := dao.UpdateEntityTx(txDB, orderInfo, "Status"); err != nil {
+				dao.Rollback(db, txDB)
+				return nil, "更新order.Status状态失败", err
+			}
+			//if _, err := dao.SetOrderStatus(txDB, orderInfo.PayPrice, 1, 110, orderID); err != nil {
+			//	dao.Rollback(db, txDB)
+			//	return nil, "更新order状态失败", err
+			//}
 			//todo 后续需增加其他订单类型
 			//(1)更新快递 订单状态
 			globals.SugarLogger.Debug("更新UserVendorOrder状态")

From fb90a96f65a5e81d798bca0ae57b06700a86f6f9 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Thu, 4 Aug 2022 17:43:42 +0800
Subject: [PATCH 2/2] pay

---
 business/jxstore/financial/financial.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go
index 546185b1e..289b6c699 100644
--- a/business/jxstore/financial/financial.go
+++ b/business/jxstore/financial/financial.go
@@ -283,14 +283,20 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 			}()
 			globals.SugarLogger.Debug("更新order")
 			order.TransactionID = call.TrxID
+			order.Status = 110 //支付成功状态
 			globals.SugarLogger.Debug("输出赋值后的order.TransactionID", order.TransactionID)
 			if _, err := dao.UpdateEntityTx(txdb, order, "TransactionID"); err != nil {
 				dao.Rollback(db, txdb)
 				return err
 			}
+			if _, err := dao.UpdateEntityTx(txdb, order, "Status"); err != nil {
+				dao.Rollback(db, txdb)
+				return err
+			}
 			//测试order 数据库是否更新成功
 			order_test, err := dao.GetOrderByID(db, order.OrderID)
 			globals.SugarLogger.Debug("再次从数据库拿order.TransactionID", order_test.TransactionID)
+			globals.SugarLogger.Debug("再次从数据库拿order.Status", order_test.Status)
 			////////////////////////////////////
 
 			globals.SugarLogger.Debug("获取UserVendorOrder")