From 816a947ffb332fbba1b984cd273c0f2c1060fd9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 30 May 2023 15:20:59 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/order.go              | 10 ----------
 business/jxcallback/orderman/orderman_ext.go       |  4 ++--
 business/jxcallback/scheduler/defsch/defsch_ext.go |  4 ++++
 business/partner/delivery/dada/waybill.go          |  2 ++
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 2c7caca12..96a4defa1 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -539,16 +539,6 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W
 	cancelWaybill[bill.VendorWaybillID] = bill
 	// 已经全部运单取消,退款结算
 	if len(bills) == len(cancelWaybill) {
-		//for _, v := range bills {
-		//	if v.VendorWaybillID == bill.VendorWaybillID {
-		//		continue
-		//	}
-		//	// 已经取消订单的违约金计算
-		//	if err = countWaybillSettleInfo(db, order, v, store); err != nil {
-		//		return err
-		//	}
-		//}
-
 		// 最终的金额核算,多退少补
 		if err = orderFeeSettle(db, order, bill, bills, store); err != nil {
 			return err
diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index bdc7dd678..844895e77 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -382,8 +382,8 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
 						var damages = &struct {
 							Damages int64 `json:"damages"`
 						}{}
-						sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? `
-						paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled}
+						sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? AND w.vendor_waybill_id <> ? `
+						paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled, order.VendorWaybillID}
 						if err := dao.GetRow(db, damages, sqlDamages, paramDamages); err == nil {
 							order.LiquidatedDamages = damages.Damages
 						}
diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index a3b3017f6..009c8ac57 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -427,6 +427,10 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
 			// 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度
 			savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
 			if savedOrderInfo != nil {
+				// 查询三方运单是否为取消状态
+				//for _, v := range savedOrderInfo.waybills {
+				//	mtps, err := api.MtpsAPI.QueryOrderStatus(0, v.VendorWaybillID)
+				//}
 				err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
 			} else {
 				err = scheduler.ErrCanNotFindOrder
diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go
index c1e785a8b..9feea5a0e 100644
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -589,6 +589,8 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 		}
 	}
 
+	// 直接返回的 原因是,一个订单在达达发布多次运单时,QueryOrderInfo获取到的运单始终是最后一个运单的配送价格!所以直接返回算了!
+	return localPrice, nil
 	// 平台状态兑换金额
 	var vendorPrice int64 = 0
 	// 未接单不扣款