From d276ae55aac3783640ee3f94b5df33564c4be668 Mon Sep 17 00:00:00 2001 From: renyutian Date: Thu, 4 Apr 2019 14:51:10 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/financial.go | 2 +- business/partner/purchase/mtwm/financial.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index f7f3168f3..544e279b9 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -154,7 +154,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( // orderFinancial.DeliveryConfirmTime = getTimeFromInterface(order1["finished_time"]) orderFinancial.TotalDiscountMoney = utils.MustInterface2Int64(order1["discount_fee"]) orderFinancial.ReceivableFreight = utils.MustInterface2Int64(order1["send_fee"]) - if int(utils.MustInterface2Int64(order1["send_immediately"])) == ebaiapi.SendImmediatelySelf { + if int(utils.MustInterface2Int64(order1["delivery_party"])) == ebaiapi.SendImmediatelySelf { orderFinancial.SelfDeliveryDiscountMoney = orderFinancial.ReceivableFreight orderFinancial.DistanceFreightMoney = 0 // 通过本地数据库去取是否转美团/达达，并计算运费 diff --git a/business/partner/purchase/mtwm/financial.go b/business/partner/purchase/mtwm/financial.go index abdbef57a..00eef9f71 100644 --- a/business/partner/purchase/mtwm/financial.go +++ b/business/partner/purchase/mtwm/financial.go @@ -196,9 +196,12 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( VendorOrderID: orderFinancial.VendorOrderID, // ActivityName: utils.Interface2String(x["remark"]), // ActivityMoney: jxutils.StandardPrice2Int(utils.MustInterface2Float64(x["reduce_fee"])), - VendorActivityID: utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"])), + // VendorActivityID: utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"])), + } + if x["act_detail_id"] != nil { // 容错处理 + activity.VendorActivityID = utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"])) + orderFinancial.Discounts = append(orderFinancial.Discounts, activity) } - orderFinancial.Discounts = append(orderFinancial.Discounts, activity) // 通过活动Id去取，京西活动补贴 // orderFinancial.JxSubsidyMoney += }