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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-09-06 13:51:51 +08:00
parent ab6db54205 3dc6d1508e
commit fbfec31c95
9 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/partner/purchase/mtwm/order.go
View File

@@ -9,6 +9,8 @@ import (
"strings"
"time"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -396,14 +398,14 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
}
})
// 美团订单完成时,获取跑腿费用
if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil {
bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
if bill == nil && err == nil {
bill.ActualFee = fee
bill.DesiredFee = fee
dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
}
}
//if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil {
// bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
// if bill == nil && err == nil {
// bill.ActualFee = fee
// bill.DesiredFee = fee
// dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
// }
//}
}
}