From 3bc6608e1fa70c537c615833971a964f32465517 Mon Sep 17 00:00:00 2001 From: lyb Date: Fri, 10 Aug 2018 11:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=BA=AC=E4=B8=9CAPI?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=BB=93=E8=B4=A6=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/controller/elm/order.go | 5 +++++ business/controller/jd/order.go | 9 --------- business/controller/jd/waybill.go | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/business/controller/elm/order.go b/business/controller/elm/order.go index 168a0ea52..fbbf7af30 100644 --- a/business/controller/elm/order.go +++ b/business/controller/elm/order.go @@ -194,6 +194,11 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err } return order, err } +func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) { + //var skuTotalPmFee, orderPmFee, skuTotalPmSubsidy, orderPmSubsidy float64 + + order.BoxFee = jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["packageFee"])) +} // func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) { diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go index 9af2d6276..64a9d371d 100644 --- a/business/controller/jd/order.go +++ b/business/controller/jd/order.go @@ -147,15 +147,6 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"]) } -func setSkuDetailFee(skuPmFee int64, skuPmSubsidy int64, order *model.GoodsOrder, skuId int64) { - for _, value := range order.Skus { - if value.SkuID == int(skuId) { - value.SkuPmSubsidy = skuPmSubsidy - value.SkuPmFee = skuPmFee - } - } -} - // func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { order, err := c.GetOrder(msg.BillID) diff --git a/business/controller/jd/waybill.go b/business/controller/jd/waybill.go index 718f9786e..0d98972ed 100644 --- a/business/controller/jd/waybill.go +++ b/business/controller/jd/waybill.go @@ -26,7 +26,7 @@ func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) ( order.Status = model.WaybillStatusNew case jdapi.DeliveryStatusAccepted: if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil { - order.DesiredFee = utils.Interface2Int64WithDefault(result["orderFreightMoney"], 0) + + order.DesiredFee = utils.Interface2Int64WithDefault(result["orderReceivableFreight"], 0) + utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) + utils.Interface2Int64WithDefault(result["tips"], 0) }