From 6170a3e8ce811c6b2056dd480321232e22e2a4a1 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 13 Nov 2024 10:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/db/model/mall_ord.go                | 1 +
 consume/yibao_order_share_money_mall.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/db/model/mall_ord.go b/app/db/model/mall_ord.go
index 22b3e74..24c45ad 100644
--- a/app/db/model/mall_ord.go
+++ b/app/db/model/mall_ord.go
@@ -102,6 +102,7 @@ type MallOrd struct {
 	PayDiscountMoney        string    `json:"pay_discount_money" xorm:"default '0.00' comment('供应链同一商家总运费') DECIMAL(12,2)"`
 	IsDeductDiscount        int       `json:"is_deduct_discount" xorm:"comment('') INT(11)"`
 	IsShareMoney            int       `json:"is_share_money" xorm:"default 0 comment('') INT(11)"`
+	PayTradeNo              string    `json:"pay_trade_no" xorm:"comment('支付联盟支付的订单号') VARCHAR(50)"`
 	PayOid                  string    `json:"pay_oid" xorm:" default '' comment('') VARCHAR(255)"`
 	ShareMoneyOid           string    `json:"share_money_oid" xorm:" default '' comment('') VARCHAR(255)"`
 	MerchantNo              string    `json:"merchant_no" xorm:" default '' comment('') VARCHAR(255)"`
diff --git a/consume/yibao_order_share_money_mall.go b/consume/yibao_order_share_money_mall.go
index 1707c94..03f41e2 100644
--- a/consume/yibao_order_share_money_mall.go
+++ b/consume/yibao_order_share_money_mall.go
@@ -88,7 +88,7 @@ func handleZhiosYibao0rderShareMoneyMallExchange(msg []byte) error {
 		}
 		uid = v.Uid
 		uniqueOrderNo = v.TransactionId
-		payOid = v.PayOid
+		payOid = v.PayTradeNo
 		payMethod = v.PayChannel
 		MerchantNo = v.MerchantNo
 		fee = utils.StrToFloat64(v.TotalShippingFee)