From 61e88ae6b9645b9d82c5bd2b7ce8a74fa75cc795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 15 May 2025 18:29:13 +0800
Subject: [PATCH] 1

---
 business/jxstore/misc/misc.go      |  2 +-
 business/partner/delivery/rider.go | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index b032a48b5..a9a687cdf 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -239,7 +239,7 @@ func Init() {
 			"04:00:00",
 		})
 
-		// 每天更新美团-门店结算方式[结算给企业/结算给个人]
+		// 每天更新美团-门店结算方式[结算给企业/结算给个人](取消了平台运单的骑手计费)
 		ScheduleTimerFunc("LoadingStoreOrderSettleAmount", func() {
 			delivery.LoadingStoreOrderSettleAmount(0, 0, nil)
 		}, []string{
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 93f2b2a6b..0ff2caa97 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -634,18 +634,18 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
 				}
 			}
 			// 更新订单的配送信息
-			if so.TimingFee != 0 || so.DeliveryFee != 0 {
-				if so.TimingFee < 0 {
-					so.TimingFee = so.TimingFee * -1
-				}
-				if so.DeliveryFee < 0 {
-					so.DeliveryFee = so.DeliveryFee * -1
-				}
-				wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? `
-				if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil {
-					globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err)
-				}
-			}
+			//if so.TimingFee != 0 || so.DeliveryFee != 0 {
+			//	if so.TimingFee < 0 {
+			//		so.TimingFee = so.TimingFee * -1
+			//	}
+			//	if so.DeliveryFee < 0 {
+			//		so.DeliveryFee = so.DeliveryFee * -1
+			//	}
+			//	wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? `
+			//	if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil {
+			//		globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err)
+			//	}
+			//}
 
 		}