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

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

Browse Source
This commit is contained in:
richboo111
2023-06-12 14:16:05 +08:00
parent 866aa16bc5 c00083fd05
commit d61c4d672b
24 changed files with 251 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/partner/delivery/uupt/waybill.go
View File

@@ -341,6 +341,10 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp
} else {
reallyPrice = int64(utils.Str2Float64(uuPrice.OrderPrice) * 100)
}
store, _ := dao.GetStoreDetail(dao.GetDB(), good.JxStoreID, good.VendorID, good.VendorOrgCode)
reallyPrice += int64(store.FreightMarkup)
actualFee := int64((utils.Str2Float64(uuPrice.OrderPrice)-utils.Str2Float64(uuPrice.PriceOff))*100) - int64(utils.WayBillDeliveryMarkUp)
switch req.State {
case uuptapi.StateConfirmSuccess: