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

1

Browse Source
This commit is contained in:
richboo111
2023-09-06 10:18:19 +08:00
parent ef9c37ac1b
commit 3dc6d1508e
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
business/partner/purchase/mtwm/waybill.go
View File

@@ -55,12 +55,12 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal
retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp"))) retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp")))
} }
order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM) //order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM)
if err == nil && order != nil { //if err == nil && order != nil {
fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order) // fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order)
retVal.ActualFee = fee // retVal.ActualFee = fee
retVal.DesiredFee = fee // retVal.DesiredFee = fee
} //}
return retVal return retVal
} }