From 48ab6f7e75231a8b6b880ef3fb16acae6547e014 Mon Sep 17 00:00:00 2001 From: renyutian Date: Thu, 4 Apr 2019 17:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E5=B0=9D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/financial.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/business/partner/purchase/mtwm/financial.go b/business/partner/purchase/mtwm/financial.go index 00eef9f71..9eb2b6b99 100644 --- a/business/partner/purchase/mtwm/financial.go +++ b/business/partner/purchase/mtwm/financial.go @@ -226,14 +226,14 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) ( } else { globals.SugarLogger.Warnf("mtwm OrderDetail2Financial, orderID:%s have no poi_receive_detail", orderFinancial.VendorOrderID) } - if utils.MustInterface2Int64(result["is_third_shipping"]) == 1 { // is_third_shipping int 是否是第三方配送平台配送,0表否，1表是） + if utils.MustInterface2Int64(result["is_third_shipping"]) == SelfDeliveryCarrierNo { // is_third_shipping int 是否是第三方配送平台配送,0表否，1表是） orderFinancial.SelfDeliveryDiscountMoney = orderFinancial.ReceivableFreight orderFinancial.DistanceFreightMoney = 0 // 通过本地数据库去取是否转美团/达达，并计算运费 - wayBill, err := partner.CurOrderManager.LoadWaybill(orderFinancial.VendorOrderID, orderFinancial.VendorID) - if err == nil { - orderFinancial.JxFreightMoney = wayBill.DesiredFee - } + // wayBill, err := partner.CurOrderManager.LoadWaybill(orderFinancial.VendorOrderID, orderFinancial.VendorID) + // if err == nil { + // orderFinancial.JxFreightMoney = wayBill.DesiredFee + // } } // // 美团订单单独处理部分，美团正向订单接口推送时总结算金额没有计算公益捐款一分钱，是否在这里直接提前扣除？ // // 3/18之后的订单一直都不显示公益捐款金额，而且结算现在结算到了3/18之后的订单，没有的已经不计算了，先注释