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

Merge branch 'lcw' of git.coding.net:XJH-Rosy/jx-callback into lcw

Browse Source
This commit is contained in:
gazebo
2019-04-04 15:50:33 +08:00
parent bb882a016a 18d7a24ba5
commit a0e1875911
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/purchase/ebai/financial.go
View File

@@ -154,7 +154,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
// orderFinancial.DeliveryConfirmTime = getTimeFromInterface(order1["finished_time"]) // orderFinancial.DeliveryConfirmTime = getTimeFromInterface(order1["finished_time"])
orderFinancial.TotalDiscountMoney = utils.MustInterface2Int64(order1["discount_fee"]) orderFinancial.TotalDiscountMoney = utils.MustInterface2Int64(order1["discount_fee"])
orderFinancial.ReceivableFreight = utils.MustInterface2Int64(order1["send_fee"]) orderFinancial.ReceivableFreight = utils.MustInterface2Int64(order1["send_fee"])
if int(utils.MustInterface2Int64(order1["send_immediately"])) == ebaiapi.SendImmediatelySelf { if int(utils.MustInterface2Int64(order1["delivery_party"])) == ebaiapi.SendImmediatelySelf {
orderFinancial.SelfDeliveryDiscountMoney = orderFinancial.ReceivableFreight orderFinancial.SelfDeliveryDiscountMoney = orderFinancial.ReceivableFreight
orderFinancial.DistanceFreightMoney = 0 orderFinancial.DistanceFreightMoney = 0
// 通过本地数据库去取是否转美团/达达，并计算运费 // 通过本地数据库去取是否转美团/达达，并计算运费

7
business/partner/purchase/mtwm/financial.go
View File

@@ -196,9 +196,12 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
VendorOrderID: orderFinancial.VendorOrderID, VendorOrderID: orderFinancial.VendorOrderID,
// ActivityName: utils.Interface2String(x["remark"]), // ActivityName: utils.Interface2String(x["remark"]),
// ActivityMoney: jxutils.StandardPrice2Int(utils.MustInterface2Float64(x["reduce_fee"])), // ActivityMoney: jxutils.StandardPrice2Int(utils.MustInterface2Float64(x["reduce_fee"])),
VendorActivityID: utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"])), // VendorActivityID: utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"])),
}
if x["act_detail_id"] != nil { // 容错处理
activity.VendorActivityID = utils.Int64ToStr(utils.MustInterface2Int64(x["act_detail_id"]))
orderFinancial.Discounts = append(orderFinancial.Discounts, activity)
} }
orderFinancial.Discounts = append(orderFinancial.Discounts, activity)
// 通过活动Id去取，京西活动补贴 // 通过活动Id去取，京西活动补贴
// orderFinancial.JxSubsidyMoney += // orderFinancial.JxSubsidyMoney +=
} }