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

打桩

Browse Source
This commit is contained in:
邹宗楠
2022-03-05 16:34:10 +08:00
parent 3e72048bcf
commit 31545dde2e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -383,7 +383,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
} else { } else {
if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil { if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil {
if handler.Use4CreateWaybill { if handler.Use4CreateWaybill {
globals.SugarLogger.Warnf("获取美团运单开始", handler.Handler.GetVendorID()) globals.SugarLogger.Info("获取美团运单开始", handler.Handler.GetVendorID())
// 获取订单配送费用 // 获取订单配送费用
if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil { if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil {
feeInfo = &partner.WaybillFeeInfo{ feeInfo = &partner.WaybillFeeInfo{

8
business/partner/delivery/mtps/waybill.go
View File

@@ -193,7 +193,7 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
// 新方法平台返回 // 新方法平台返回
func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
globals.SugarLogger.Warnf("获取美团订单,创建美团订单预期请求======================>>>>>>>>>>>>") globals.SugarLogger.Info("获取美团订单,创建美团订单预期请求======================>>>>>>>>>>>>")
db := dao.GetDB() db := dao.GetDB()
deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo = &partner.WaybillFeeInfo{}
deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{ deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
@@ -213,9 +213,9 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
OuterOrderSourceDesc: "101", OuterOrderSourceDesc: "101",
}) })
//deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db) //deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
baseapi.SugarLogger.Debug("errrr:=====", err) baseapi.SugarLogger.Info("errrr:=====", err)
baseapi.SugarLogger.Debug("delFee:=====", deliveryFeeInfo.RefDeliveryFee) baseapi.SugarLogger.Info("delFee:=====", deliveryFeeInfo.RefDeliveryFee)
baseapi.SugarLogger.Debug("FeeInfo:=====", deliveryFeeInfo.RefAddFee) baseapi.SugarLogger.Info("FeeInfo:=====", deliveryFeeInfo.RefAddFee)
if err != nil { if err != nil {
if _, err = c.getMTPSShopID(order, db); err == nil { if _, err = c.getMTPSShopID(order, db); err == nil {
deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee

2
controllers/jx_order.go
View File

@@ -104,7 +104,7 @@ func (c *OrderController) ConfirmSelfTake() {
// @router /QueryOrderWaybillFeeInfo [get] // @router /QueryOrderWaybillFeeInfo [get]
func (c *OrderController) QueryOrderWaybillFeeInfo() { func (c *OrderController) QueryOrderWaybillFeeInfo() {
c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) { c.callQueryOrderWaybillFeeInfo(func(params *tOrderQueryOrderWaybillFeeInfoParams) (retVal interface{}, errCode string, err error) {
globals.SugarLogger.Warnf("开始三方运单") globals.SugarLogger.Info("开始三方运单")
retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID) retVal, err = defsch.FixedScheduler.QueryOrderWaybillFeeInfoEx(params.Ctx, params.VendorOrderID, params.VendorID)
return retVal, "", err return retVal, "", err
}) })