From ff6cd228a6e3a932898e79ed52035e29520864b6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 16 Dec 2019 10:19:54 +0800
Subject: [PATCH] =?UTF-8?q?jd.postFakeMsg=E4=B8=AD=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEAppKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go         |  1 +
 business/partner/purchase/jd/jd.go    |  2 +-
 business/partner/purchase/jd/order.go | 20 +++++++++++---------
 business/partner/purchase/jd/store.go |  2 --
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index fb06b8ae1..004928fc9 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1043,6 +1043,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	userName := ctx.GetUserName()
 	storeMap.StoreID = storeID
 	storeMap.VendorID = vendorID
+	storeMap.VendorOrgCode = vendorOrgCode
 	storeMap.Status = model.StoreStatusOpened
 	storeMap.DeliveryType = model.StoreDeliveryTypeByStore
 	storeMap.SyncStatus = 0
diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go
index 035c16e50..c463e2f95 100644
--- a/business/partner/purchase/jd/jd.go
+++ b/business/partner/purchase/jd/jd.go
@@ -24,7 +24,7 @@ func init() {
 
 func getAPI(appOrgCode string) (apiObj *jdapi.API) {
 	if appOrgCode == "" {
-		// globals.SugarLogger.Warnf("getAPI appOrgCode is empty")
+		globals.SugarLogger.Warnf("getAPI appOrgCode is empty")
 	}
 	return partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API)
 }
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index dc658c7a9..1ceb17ea5 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -284,12 +284,14 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
 	return orderStatus
 }
 
-func (c *PurchaseHandler) postFakeMsg(vendorOrderID, vendorStatus string) {
+func (c *PurchaseHandler) postFakeMsg(vendorOrgCode, vendorOrderID, vendorStatus string) {
 	msg := &jdapi.CallbackOrderMsg{
-		CallbackMsg: &jdapi.CallbackMsg{},
-		BillID:      vendorOrderID,
-		StatusID:    vendorStatus,
-		Timestamp:   utils.Time2Str(time.Now()),
+		CallbackMsg: &jdapi.CallbackMsg{
+			AppKey: getAPI(vendorOrgCode).GetAppKey(),
+		},
+		BillID:    vendorOrderID,
+		StatusID:  vendorStatus,
+		Timestamp: utils.Time2Str(time.Now()),
 	}
 	utils.CallFuncAsync(func() {
 		OnOrderMsg(msg)
@@ -309,14 +311,14 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 	if globals.EnableJdStoreWrite {
 		err = getAPI(order.VendorOrgCode).OrderAcceptOperate(order.VendorOrderID, isAcceptIt, userName)
 		if isAcceptIt && err == nil {
-			c.postFakeMsg(order.VendorOrderID, jdapi.StatusIDWaitOutStore)
+			c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.StatusIDWaitOutStore)
 		}
 	} else {
 		if isAcceptIt {
-			c.postFakeMsg(order.VendorOrderID, jdapi.StatusIDWaitOutStore)
+			c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.StatusIDWaitOutStore)
 		} else {
 
-			c.postFakeMsg(order.VendorOrderID, jdapi.OrderStatusCanceled)
+			c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.OrderStatusCanceled)
 		}
 	}
 	return err
@@ -327,7 +329,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 	if !isSelfDelivery && globals.EnableJdStoreWrite {
 		_, err = getAPI(order.VendorOrgCode).OrderJDZBDelivery(order.VendorOrderID, userName)
 	} else {
-		c.postFakeMsg(order.VendorOrderID, jdapi.OrderStatusFinishedPickup)
+		c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.OrderStatusFinishedPickup)
 	}
 	return err
 }
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 446c003d2..ba0de3170 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -113,8 +113,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 				retVal.DeliveryRange = utils.Int2Str(deliveryRange.DeliveryRangeRadius)
 			}
 			return retVal, nil
-		} else {
-			globals.SugarLogger.Warnf("jd vendorOrgCode:%s vendorStoreID:%s", vendorOrgCode, vendorStoreID)
 		}
 	}
 	return nil, err