From 0f9a125b4c02f4a00633a42f35169040ce8dabd4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 13 May 2019 11:52:37 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=BE=BE=E8=BE=BE=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=9C=A8=E5=88=9B=E5=BB=BA=E6=97=B6=E5=B0=B1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/waybill.go | 6 +++--- business/partner/delivery/dada/waybill.go | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index 842df9e3a..83f893758 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -97,9 +97,9 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { } else { addParams := orm.Params{} if bill.Status >= model.WaybillStatusAccepted && bill.Status < model.WaybillStatusEndBegin { - if bill.Status == model.WaybillStatusAccepted { - addParams["desired_fee"] = bill.DesiredFee - } + // if bill.Status == model.WaybillStatusAccepted { + // addParams["desired_fee"] = bill.DesiredFee + // } if bill.CourierMobile != "" { addParams["courier_name"] = bill.CourierName addParams["courier_mobile"] = bill.CourierMobile diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 0efa09fed..a26817394 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -58,12 +58,16 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap order := c.callbackMsg2Waybill(msg) switch msg.OrderStatus { case dadaapi.OrderStatusWaitingForAccept: - order.Status = model.WaybillStatusNew - case dadaapi.OrderStatusAccepted: if result, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil { order.ActualFee = jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["actualFee"], 0.0)) order.DesiredFee = jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["deliveryFee"], 0.0)) } + order.Status = model.WaybillStatusNew + case dadaapi.OrderStatusAccepted: + // if result, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil { + // order.ActualFee = jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["actualFee"], 0.0)) + // order.DesiredFee = jxutils.StandardPrice2Int(utils.Interface2Float64WithDefault(result["deliveryFee"], 0.0)) + // } order.Status = model.WaybillStatusAccepted case dadaapi.OrderStatusDelivering: order.Status = model.WaybillStatusDelivering