From a73dfb65277ee1a4d96e9fc8eabca60bfdc71147 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 3 Aug 2022 16:17:45 +0800
Subject: [PATCH] pay

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

diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go
index 5e58ace30..d26b6d71a 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -120,18 +120,25 @@ func Pay(ctx *jxcontext.Context, orderID string, payType int, vendorPayType, app
 	if _, err := dao.SetOrderStatus(temp_PayPrice, temp_PayMethod, orderID); err != nil {
 		return nil, err
 	}
-	if _, err := dao.UpdateEntityTx(txDB, order); err != nil {
-		return nil, err
-	}
+	//if _, err := dao.UpdateEntityTx(txDB, order); err != nil {
+	//	return nil, err
+	//}
 	globals.SugarLogger.Debug("经过更新操作后的数据after=========================", order.OrderID, order.PayPrice, order.PayMethod)
 	globals.SugarLogger.Debug("经过更新操作后的数据after=========================", order.PayPrice)
 	globals.SugarLogger.Debugf("pay begin……")
-	err = dao.GetEntity(db, order, "OrderID")
-	if order.OrderID == "" {
-		return result, fmt.Errorf("未找到此订单！")
+	//err = dao.GetEntity(db, order, "OrderID")
+	//if order.OrderID == "" {
+	//	return result, fmt.Errorf("未找到此订单！")
+	//}
+
+	info, err := dao.GetOrderByID(db, orderID)
+	if err != nil {
+		return nil, err
 	}
-	payHandler.Order = order
-	globals.SugarLogger.Debug("再次从数据库获得order详情", payHandler.Order.PayPrice, payHandler.Order.PayMethod)
+	globals.SugarLogger.Debug("Order再次从数据库获得order详情", info.PayPrice, info.PayMethod)
+	payHandler.Order = info
+
+	globals.SugarLogger.Debug("payHandler.Order再次从数据库获得order详情", payHandler.Order.PayPrice, payHandler.Order.PayMethod)
 	//如果用户没有对应账单信息就给他生成一条
 	// 给用户创建一个银行卡账户
 	globals.SugarLogger.Debug("create bill begin……")