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

饿百 部分退款订单漏单，取错字段

Browse Source
This commit is contained in:
renyutian
2019-04-24 13:41:27 +08:00
parent 900795bb12
commit 185ebf7d10
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,8 @@ import (
func OnFinancialMsg(msg *ebaiapi.CallbackMsg) (err error) {
if msg.Cmd == ebaiapi.CmdOrderPartRefund { // 部分退款处理
if utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"])) == ebaiapi.OrderPartRefundSuccess {
orderData, err2 := api.EbaiAPI.OrderPartrefundGet(utils.Interface2String(msg.Body["refund_id"]))
afsOrderID := utils.Interface2String(msg.Body["order_id"])
orderData, err2 := api.EbaiAPI.OrderPartrefundGet(afsOrderID)
if err = err2; err == nil {
afsOrder := CurPurchaseHandler.AfsOrderDetail2Financial(orderData)
err = partner.CurOrderManager.SaveAfsOrderFinancialInfo(afsOrder)
@@ -233,6 +234,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
// ActivityName: utils.Interface2String(xMap["desc"]),
// ActivityMoney: discountPrice,
VendorActivityID: utils.Interface2String(xMap["activity_id"]),
Type: utils.Interface2String(xMap["type"]),
}
orderFinancial.Discounts = append(orderFinancial.Discounts, activity)
// 通过活动Id去取，京西活动补贴

8
business/partner/purchase/jd/financial.go
View File

@@ -99,6 +99,7 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{}
// 如果为自配送，自配送补贴=订单初始运费，远距离费=0
orderFinancial.SelfDeliveryDiscountMoney = utils.MustInterface2Int64(orderData["orderReceivableFreight"])
orderFinancial.DistanceFreightMoney = 0
orderFinancial.FreightTipsMoney = 0
// 通过本地数据库去取是否转美团/达达，并计算运费
// wayBill, err2 := partner.CurOrderManager.LoadWaybill(orderFinancial.VendorOrderID, orderFinancial.VendorID)
// if err = err2; err == nil {
@@ -127,11 +128,12 @@ func (p *PurchaseHandler) OrderDetail2Financial(orderData map[string]interface{}
if xMap["orderShareRatioData"] != nil {
orderShareRatioData, _ := utils.HTTPBody2Values([]byte(utils.Interface2String(xMap["orderShareRatioData"])), false)
activity := &model.OrderDiscountFinancial{
VendorID: orderFinancial.VendorID,
VendorOrderID: orderFinancial.VendorOrderID,
VendorID: orderFinancial.VendorID,
VendorOrderID: orderFinancial.VendorOrderID,
VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]),
Type: utils.Int64ToStr(int64(discountType)),
// ActivityName: utils.Interface2String(xMap["discountName"]),
// ActivityMoney: discountPrice,
VendorActivityID: utils.Interface2String(orderShareRatioData["promotionId"][0]),
// Remark: utils.Interface2String(xMap["orderShareRatioData"]),
}
orderFinancial.Discounts = append(orderFinancial.Discounts, activity)