From 19984e1f46da2e4042343827666840579b53a7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 7 Mar 2022 15:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=93=E6=A1=A9=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/delivery/mtps/waybill.go | 14 ++------------
 controllers/jx_order.go                   |  1 -
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 57d7d4828..3bc2a678a 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -4,7 +4,6 @@ import (
 	"crypto/sha1"
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/baseapi"
 	"math/rand"
 	"net/http"
 	"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) {
-	globals.SugarLogger.Info("获取美团订单,创建美团订单预期请求======================>>>>>>>>>>>>")
 	shopWeight := float64(order.Weight) / float64(order.Weight)
 	if shopWeight > 50 {
 		return nil, fmt.Errorf("订单重量超过五十千克,无法出货")
 	}
 
-	db := dao.GetDB()
 	deliveryFeeInfo = &partner.WaybillFeeInfo{}
 	deliveryFeeInfo.RefDeliveryFee, deliveryFeeInfo.RefAddFee, err = api.MtpsAPI.PreCreateByShop(&mtpsapi.PreCreateByShopParam{
 		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集中送
 		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
 }
 
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index e55ac70a0..60f1340ae 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -104,7 +104,6 @@ func (c *OrderController) ConfirmSelfTake() {
 // @router /QueryOrderWaybillFeeInfo [get]
 func (c *OrderController) QueryOrderWaybillFeeInfo() {
 	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)
 		return retVal, "", err
 	})