From 9b28749d54298516ed509c6f31128f0d3d800c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 4 Jul 2022 14:54:29 +0800
Subject: [PATCH] 1

---
 business/jxstore/financial/financial.go | 32 ++++++++++++++++++-------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/financial/financial.go b/business/jxstore/financial/financial.go
index 38108a028..af33b12de 100644
--- a/business/jxstore/financial/financial.go
+++ b/business/jxstore/financial/financial.go
@@ -83,16 +83,30 @@ func (p *PayHandler) CreatePay(txDB orm.TxOrmer, subAppID string) (err error) {
 
 			result, err := api.TLpayAPI.CreateUnitorderOrder(param)
 			globals.SugarLogger.Debug("===================err", err)
-			if err == nil {
-				var result2 tonglianpayapi.PayInfo
-				json.Unmarshal([]byte(result.PayInfo), &result2)
-				p.Order.PrepayID = result2.Package[strings.LastIndex(result2.Package, "=")+1 : len(result2.Package)]
-				p.Order.TransactionID = result.TrxID
-				globals.SugarLogger.Debug("===================p.Order.PrepayID", p.Order.PrepayID)
-				globals.SugarLogger.Debug("===================p.Order.TransactionID ", p.Order.TransactionID)
-
-				_, err = dao.UpdateEntityTx(txDB, p.Order, "PrepayID", "TransactionID")
+			if err != nil {
+				return err
 			}
+
+			var result2 tonglianpayapi.PayInfo
+			json.Unmarshal([]byte(result.PayInfo), &result2)
+			p.Order.PrepayID = result2.Package[strings.LastIndex(result2.Package, "=")+1 : len(result2.Package)]
+			p.Order.TransactionID = result.TrxID
+			globals.SugarLogger.Debug("===================p.Order.PrepayID", p.Order.PrepayID)
+			globals.SugarLogger.Debug("===================p.Order.TransactionID ", p.Order.TransactionID)
+
+			if _, err = dao.UpdateEntityTx(txDB, p.Order, "PrepayID", "TransactionID"); err != nil {
+				return err
+			}
+			wxPay := &WxPayParam{
+				Prepayid:  p.Order.PrepayID,
+				Noncestr:  result2.NonceStr,
+				Timestamp: utils.Int64ToStr(utils.MustInterface2Int64(result2.TimeStamp)),
+				Package:   result2.Package,
+				Partnerid: result2.pa,
+				Appid:     result2.AppID,
+				Sign:      result2.PaySign,
+			}
+			p.WxPayParam = wxPay
 		}
 		// 暂时不支持微信直接支付
 	case model.PayTypeWX: