From 3dc6d1508ea79007a5f45aa929ea4f87b1bacbaa Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 6 Sep 2023 10:18:19 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/mtwm/order.go   | 19 ++++++++++---------
 business/partner/purchase/mtwm/waybill.go | 12 ++++++------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index d886764c8..af7381656 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -3,13 +3,14 @@ package mtwm
 import (
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"math"
 	"net/url"
 	"regexp"
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
+
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"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 {
-								bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
-								if bill == nil && err == nil {
-									bill.ActualFee = fee
-									bill.DesiredFee = fee
-									dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
-								}
-							}
+							//if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil {
+							//	bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
+							//	if bill == nil && err == nil {
+							//		bill.ActualFee = fee
+							//		bill.DesiredFee = fee
+							//		dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
+							//	}
+							//}
 						}
 
 					}
diff --git a/business/partner/purchase/mtwm/waybill.go b/business/partner/purchase/mtwm/waybill.go
index 8dea3827d..68e035d70 100644
--- a/business/partner/purchase/mtwm/waybill.go
+++ b/business/partner/purchase/mtwm/waybill.go
@@ -55,12 +55,12 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal
 		retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp")))
 	}
 
-	order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM)
-	if err == nil && order != nil {
-		fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order)
-		retVal.ActualFee = fee
-		retVal.DesiredFee = fee
-	}
+	//order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM)
+	//if err == nil && order != nil {
+	//	fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order)
+	//	retVal.ActualFee = fee
+	//	retVal.DesiredFee = fee
+	//}
 
 	return retVal
 }