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

重修代码

Browse Source
This commit is contained in:
lyb
2018-08-10 10:17:21 +08:00
parent a873eb5a06
commit c45858e4e9
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,6 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
ActualPayPrice: utils.MustInterface2Int64(result["orderBuyerPayableMoney"]),
Skus: []*model.OrderSku{},
}
order.Status = c.GetStatusFromVendorStatus(order.VendorStatus)
businessTage := utils.Interface2String(result["businessTag"])
if strings.Index(businessTage, "dj_aging_immediately") >= 0 {
@@ -145,14 +144,7 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err
func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) {
order.BoxFee = utils.MustInterface2Int64(result["packagingMoney"])
order.PlatformFeeRate = model.JdPlatformFeeRate
var StoreFreightFee int64
if utils.Interface2String(result["deliveryCarrierNo"]) == model.NoJdDeliveryCarrierNo {
StoreFreightFee = 0
} else {
StoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
}
order.BillStoreFreightFee = StoreFreightFee
order.BillStoreFreightFee = utils.MustInterface2Int64(result["merchantPaymentDistanceFreightMoney"]) + utils.MustInterface2Int64(result["tips"])
}
func setSkuDetailFee(skuPmFee int64, skuPmSubsidy int64, order *model.GoodsOrder, skuId int64) {