From 9564d0453830c19941e7d0d8fab6b20d8007b42e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 31 Mar 2021 11:38:05 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jd/callback.go |  4 ++--
 business/partner/purchase/jd/order.go    | 19 ++++++++++---------
 controllers/jd_callback.go               |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/business/partner/purchase/jd/callback.go b/business/partner/purchase/jd/callback.go
index f4d45bd51..395cdc5e3 100644
--- a/business/partner/purchase/jd/callback.go
+++ b/business/partner/purchase/jd/callback.go
@@ -4,9 +4,9 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 )
 
-func OnOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+func OnOrderMsg(msg *jdapi.CallbackOrderMsg, a *jdapi.API) (retVal *jdapi.CallbackResponse) {
 	if CurPurchaseHandler != nil {
-		retVal = CurPurchaseHandler.OnOrderMsg(AppKey2OrgCode(msg.AppKey), msg)
+		retVal = CurPurchaseHandler.OnOrderMsg(a, msg)
 	}
 	return retVal
 }
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 10ced6c96..ca714dedf 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -59,9 +59,9 @@ var (
 	}
 )
 
-func (c *PurchaseHandler) OnOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+func (c *PurchaseHandler) OnOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
-		retVal = c.onOrderMsg(vendorOrgCode, msg)
+		retVal = c.onOrderMsg(a, msg)
 	}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
 	return retVal
 }
@@ -82,8 +82,8 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
 	return err
 }
 
-func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
-	a := getAPI(vendorOrgCode)
+func (c *PurchaseHandler) onOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+	// a := getAPI(vendorOrgCode)
 	if afsMsgMap[msg.MsgURL] {
 		retVal = c.OnAfsOrderMsg(a, msg)
 	} else {
@@ -119,9 +119,9 @@ func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOr
 				// 		globals.SugarLogger.Warnf("京东取消拣货：%v", err2)
 				// 	}
 				// }
-				globals.SugarLogger.Debugf("OnOrderStatusChanged jd %s", vendorOrgCode)
-				globals.SugarLogger.Debug("OnOrderStatusChanged jd %s", utils.Format4Output(status, true))
-				err := partner.CurOrderManager.OnOrderStatusChanged(vendorOrgCode, status)
+				globals.SugarLogger.Debugf("OnOrderStatusChanged jd %s", AppKey2OrgCode(msg.AppKey))
+				globals.SugarLogger.Debug("OnOrderStatusChanged jd %v", utils.Format4Output(status, true))
+				err := partner.CurOrderManager.OnOrderStatusChanged(AppKey2OrgCode(msg.AppKey), status)
 				retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
 			}
 		}
@@ -388,16 +388,17 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
 }
 
 func (c *PurchaseHandler) postFakeMsg(vendorOrgCode, vendorOrderID, vendorStatus string) {
+	a := getAPI(vendorOrgCode)
 	msg := &jdapi.CallbackOrderMsg{
 		CallbackMsg: &jdapi.CallbackMsg{
-			AppKey: getAPI(vendorOrgCode).GetAppKey(),
+			AppKey: a.GetAppKey(),
 		},
 		BillID:    vendorOrderID,
 		StatusID:  vendorStatus,
 		Timestamp: utils.Time2Str(time.Now()),
 	}
 	utils.CallFuncAsync(func() {
-		OnOrderMsg(msg)
+		OnOrderMsg(msg, a)
 	})
 }
 
diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go
index 40a7f7729..25a505b58 100644
--- a/controllers/jd_callback.go
+++ b/controllers/jd_callback.go
@@ -40,7 +40,7 @@ func (c *DjswController) orderStatus() {
 		globals.SugarLogger.Debugf("jd deliverOrder 1")
 		callbackResponse := c.handleMsg(func(a *jdapi.API, obj interface{}) (callbackResponse *jdapi.CallbackResponse) {
 			globals.SugarLogger.Debugf("jd deliverOrder 2", utils.Format4Output(callbackResponse, false))
-			callbackResponse = jd.OnOrderMsg(obj.(*jdapi.CallbackOrderMsg))
+			callbackResponse = jd.OnOrderMsg(obj.(*jdapi.CallbackOrderMsg), a)
 			globals.SugarLogger.Debugf("jd deliverOrder 3", utils.Format4Output(callbackResponse, false))
 			return callbackResponse
 		})