From 53733320c22989fd8ba0fd8d24e287fa9ad42a0b Mon Sep 17 00:00:00 2001 From: renyutian Date: Thu, 4 Apr 2019 09:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/financial.go | 5 +++-- business/partner/purchase/jd/financial.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index 1db965357..f7f3168f3 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -34,7 +34,7 @@ func OnFinancialMsg(msg *ebaiapi.CallbackMsg) (err error) { } } } else if msg.Cmd == ebaiapi.CmdOrderDeliveryStatus { // 转自送调整 - if msg.Body["status"].(string) == ebaiapi.WaybillStatusSelfDelivery { + if utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"])) == ebaiapi.WaybillStatusSelfDelivery { vendorOrderID := GetOrderIDFromMsg(msg) orderMap, err := api.EbaiAPI.OrderGet(vendorOrderID) if err == nil { @@ -183,6 +183,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( globals.SugarLogger.Warnf("ebai OrderDetail2Financial, orderID:%s is not found from partner.CurOrderManager.LoadOrder", orderFinancial.VendorOrderID) err = nil } + shop := result["shop"].(map[string]interface{}) if result["products"] != nil { products := result["products"].([]interface{}) for _, x := range products { @@ -194,7 +195,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( VendorOrderID2: orderFinancial.VendorOrderID2, // OrderFinancialID: orderFinancial.VendorOrderID, // ConfirmTime: getTimeFromInterface(order1["create_time"]), - VendorStoreID: result["app_poi_code"].(string), + VendorStoreID: utils.Interface2String(shop["baidu_shop_id"]), StoreID: storeID, JxStoreID: jxStoreID, VendorSkuID: utils.Interface2String(product["baidu_product_id"]), diff --git a/business/partner/purchase/jd/financial.go b/business/partner/purchase/jd/financial.go index f226ed390..c1d8804fd 100644 --- a/business/partner/purchase/jd/financial.go +++ b/business/partner/purchase/jd/financial.go @@ -130,7 +130,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{} VendorOrderID: orderFinancial.VendorOrderID, // ActivityName: utils.Interface2String(xMap["discountName"]), // ActivityMoney: discountPrice, - VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"]), + VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]), // Remark: utils.Interface2String(xMap["orderShareRatioData"]), } orderFinancial.Discounts = append(orderFinancial.Discounts, activity)