1

business/partner/delivery/dada/waybill.go

@@ -557,6 +557,15 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 		return 0, err
 	}
 
+	isMerchantCancel := false
+	// 获取发起取消的人员
+	for _, v := range orderStatus {
+		if v.VendorStatus == utils.Int64ToStr(model.WaybillStatusCancel) {
+			isMerchantCancel = true // 商户取消
+			break
+		}
+	}
+
 	dadaOrder, err := api.DadaAPI.QueryOrderInfo(orderId)
 	if err != nil {
 		return 0, err
@@ -569,7 +578,11 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 			continue
 		}
 		if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusFinished) || orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusDelivering) || orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusReturningInOrder) {
-			localPrice = utils.Float64TwoInt64(dadaOrder.DeliveryFee * float64(100))
+			if isMerchantCancel {
+				localPrice = utils.Float64TwoInt64(dadaOrder.DeliveryFee * float64(100))
+			} else {
+				localPrice = 0
+			}
 			break
 		}
 		if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusAccepted) {