liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jxstore

Browse Source
This commit is contained in:
gazebo
2018-09-11 22:22:42 +08:00
parent 4dcc31e36d 52041a142e
commit 3f4bdbfdca
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/const.go
View File

@@ -22,6 +22,7 @@ var (
VendorIDJD: "JD", VendorIDJD: "JD",
VendorIDMTWM: "MT", VendorIDMTWM: "MT",
VendorIDELM: "ELEME", VendorIDELM: "ELEME",
VendorIDEBAI: "EBAI",
VendorIDDada: "Dada", VendorIDDada: "Dada",
VendorIDMTPS: "MTPS", VendorIDMTPS: "MTPS",
} }
@@ -29,6 +30,7 @@ var (
VendorIDJD: "京东到家", VendorIDJD: "京东到家",
VendorIDMTWM: "美团外卖", VendorIDMTWM: "美团外卖",
VendorIDELM: "饿了么", VendorIDELM: "饿了么",
VendorIDEBAI: "饿百新零售",
VendorIDDada: "达达众包", VendorIDDada: "达达众包",
VendorIDMTPS: "美团配送", VendorIDMTPS: "美团配送",
} }

16
business/partner/purchase/jd/waybill.go
View File

@@ -6,7 +6,6 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals/api"
) )
func (c *PurchaseHandler) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) { func (c *PurchaseHandler) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
@@ -22,13 +21,14 @@ func (c *PurchaseHandler) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (re
case jdapi.DeliveryStatusWait4Grap: case jdapi.DeliveryStatusWait4Grap:
order.Status = model.WaybillStatusNew order.Status = model.WaybillStatusNew
case jdapi.DeliveryStatusAccepted: case jdapi.DeliveryStatusAccepted:
if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil { // todo 性能问题，暂时取消调用
// 默认配送费=订单应付运费(orderReceivableFreight) // if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil {
//订单应付运费为未优惠前应付运费(满免优惠，运费优惠券，VIP免基础运费，用户小费)ps：用户小费是用户给配送员的小费 // // 默认配送费=订单应付运费(orderReceivableFreight)
order.DesiredFee = utils.Interface2Int64WithDefault(result["orderReceivableFreight"], 0) + // //订单应付运费为未优惠前应付运费(满免优惠，运费优惠券，VIP免基础运费，用户小费)ps：用户小费是用户给配送员的小费
utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) + // order.DesiredFee = utils.Interface2Int64WithDefault(result["orderReceivableFreight"], 0) +
utils.Interface2Int64WithDefault(result["tips"], 0) // utils.Interface2Int64WithDefault(result["merchantPaymentDistanceFreightMoney"], 0) +
} // utils.Interface2Int64WithDefault(result["tips"], 0)
// }
order.Status = model.WaybillStatusAccepted order.Status = model.WaybillStatusAccepted
case jdapi.DeliveryStatusCourierCanceled: case jdapi.DeliveryStatusCourierCanceled:
order.Status = model.WaybillStatusAcceptCanceled order.Status = model.WaybillStatusAcceptCanceled