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-07 15:18:41 +08:00
parent 18d8c23d98
commit 19984e1f46
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ import (
"crypto/sha1" "crypto/sha1"
"errors" "errors"
"fmt" "fmt"
"git.rosy.net.cn/baseapi"
"math/rand" "math/rand"
"net/http" "net/http"
"net/url" "net/url"
@@ -193,13 +192,11 @@ 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.Info("获取美团订单,创建美团订单预期请求======================>>>>>>>>>>>>")
shopWeight := float64(order.Weight) / float64(order.Weight) shopWeight := float64(order.Weight) / float64(order.Weight)
if shopWeight > 50 { if shopWeight > 50 {
return nil, fmt.Errorf("订单重量超过五十千克,无法出货") return nil, fmt.Errorf("订单重量超过五十千克,无法出货")
} }
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{
DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)), DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)),
@@ -217,15 +214,8 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
ExpectedDeliveryTime: mtpsapi.DeliveryServiceCodeRapid, // 4002飞速达,4011快速达,4012及时达,4013集中送 ExpectedDeliveryTime: mtpsapi.DeliveryServiceCodeRapid, // 4002飞速达,4011快速达,4012及时达,4013集中送
OuterOrderSourceDesc: "101", OuterOrderSourceDesc: "101",
}) })
//deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
baseapi.SugarLogger.Info("errrr:=====", err)
baseapi.SugarLogger.Info("delFee:=====", deliveryFeeInfo.RefDeliveryFee)
baseapi.SugarLogger.Info("FeeInfo:=====", deliveryFeeInfo.RefAddFee)
if err != nil {
if _, err = c.getMTPSShopID(order, db); err == nil {
deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee
}
}
return deliveryFeeInfo, err return deliveryFeeInfo, err
} }

1
controllers/jx_order.go
View File

@@ -104,7 +104,6 @@ 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.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
}) })