From c6d2d26bb1007113b97fa3937b3b61f4843db155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 5 Mar 2022 14:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/mtps/waybill.go | 48 +++++++++++++++-------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 6ad19a6aa..f2d2eb933 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -4,7 +4,6 @@ import ( "crypto/sha1" "errors" "fmt" - "math/rand" "net/http" "net/url" "sort" @@ -180,21 +179,6 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { db := dao.GetDB() deliveryFeeInfo = &partner.WaybillFeeInfo{} - api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{ - DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)), - OrderID: order.VendorOrderID, - ShopID: utils.Int2Str(order.StoreID), - DeliveryServiceCode: mtpsapi.DeliveryServiceCodeIntime, - ReceiverName: order.ConsigneeName, - ReceiverAddress: order.ConsigneeAddress, - ReceiverPhone: order.ConsigneeMobile, - ReceiverLng: order.ConsigneeLng, - ReceiverLat: order.ConsigneeLat, - GoodsValue: utils.Int64ToFloat64(order.ActualPayPrice), - GoodsWeight: utils.Int2Float64(order.Weight), - PayTypeCode: 0, - OuterOrderSourceDesc: "101", - }) deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db) if err == nil { if _, err = c.getMTPSShopID(order, db); err == nil { @@ -204,6 +188,38 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf return deliveryFeeInfo, err } +// +//// todo 是否应该语法订单 +//func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { +// db := dao.GetDB() +// deliveryFeeInfo = &partner.WaybillFeeInfo{} +// api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{ +// DeliveryID: time.Now().Unix()*100 + int64(rand.Intn(2)), +// OrderID: order.VendorOrderID, +// ShopID: utils.Int2Str(order.StoreID), +// DeliveryServiceCode: mtpsapi.DeliveryServiceCodeIntime, +// ReceiverName: order.ConsigneeName, +// ReceiverAddress: order.ConsigneeAddress, +// ReceiverPhone: order.ConsigneeMobile, +// ReceiverLng: order.ConsigneeLng, +// ReceiverLat: order.ConsigneeLat, +// GoodsValue: utils.Int64ToFloat64(order.ActualPayPrice), +// GoodsWeight: utils.Int2Float64(order.Weight), +// PayTypeCode: 0, +// OuterOrderSourceDesc: "101", +// }) +// deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = delivery.CalculateOrderDeliveryFee(order, time.Now(), db) +// baseapi.SugarLogger.Debug("errrr:=====", err) +// baseapi.SugarLogger.Debug("delFee:=====", deliveryFeeInfo.RefDeliveryFee) +// baseapi.SugarLogger.Debug("FeeInfo:=====", deliveryFeeInfo.RefAddFee) +// if err == nil { +// if _, err = c.getMTPSShopID(order, db); err == nil { +// deliveryFeeInfo.DeliveryFee = deliveryFeeInfo.RefDeliveryFee +// } +// } +// return deliveryFeeInfo, err +//} + // IDeliveryPlatformHandler（美团配送） func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { db := dao.GetDB()