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

访问京东API，获取结账必要信息。

Browse Source
This commit is contained in:
lyb
2018-08-10 11:02:06 +08:00
parent dad4ab5d73
commit 3bc6608e1f
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/controller/elm/order.go
View File

@@ -194,6 +194,11 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
} }
return order, 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) { func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {

9
business/controller/jd/order.go
View File

@@ -147,15 +147,6 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder)
order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"]) 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) { func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) {
order, err := c.GetOrder(msg.BillID) order, err := c.GetOrder(msg.BillID)

2
business/controller/jd/waybill.go
View File

@@ -26,7 +26,7 @@ func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (
order.Status = model.WaybillStatusNew order.Status = model.WaybillStatusNew
case jdapi.DeliveryStatusAccepted: case jdapi.DeliveryStatusAccepted:
if result, err := api.JdAPI.QuerySingleOrder(msg.OrderID); err == nil { 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["merchantPaymentDistanceFreightMoney"], 0) +
utils.Interface2Int64WithDefault(result["tips"], 0) utils.Interface2Int64WithDefault(result["tips"], 0)
} }