From 7f3d7792eb309b488bc1984aa526d7c9607b619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 30 Jul 2020 15:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index f02871d8f..e43544522 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -34,9 +34,7 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
 		}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop))
 	case jcqapi.TopicOrderCancel:
 		jxutils.CallMsgHandler(func() {
-			CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, &model.GoodsOrder{
-				VendorOrderID: msg.OrderID,
-			}, "系统取消")
+			CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, getRealOrderID(msg.OrderID), "系统取消")
 		}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop))
 	default:
 		return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType)
@@ -176,3 +174,17 @@ func Decrypt(p string) (result string) {
 	decryptedData, _ := utils.AESCBCDecpryt(main, data2[:16], iv)
 	return string(decryptedData)
 }
+
+func getRealOrderID(orderID string) (order *model.GoodsOrder) {
+	var (
+		db = dao.GetDB()
+	)
+	sql := `
+		SELECT * FROM goods_order WHERE vendor_order_id2 = ? ORDER BY vendor_order_id DESC LIMIT 1
+	`
+	sqlParams := []interface{}{
+		orderID,
+	}
+	dao.GetRow(db, &order, sql, sqlParams)
+	return order
+}