修改配送费收取规则

business/partner/delivery/mtps/waybill.go

@@ -493,29 +493,33 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 		return 0, err
 	}
 
+	bill, err := partner.CurOrderManager.LoadWaybill(deliverId, model.VendorIDMTPS)
+	if err != nil {
+		return 0, err
+	}
+
 	// 已经分配骑手,且超过十五分钟,不扣款
-	if len(statusList) != model.NO {
-		for i := len(statusList) - 1; i >= 0; i-- {
-			switch statusList[i].VendorStatus {
-			case utils.Int2Str(mtpsapi.OrderStatusWaitingForSchedule): // 待调度
-				return 0, nil
-			case utils.Int2Str(mtpsapi.OrderStatusCanceled): // 取消不管
-				continue
-			case utils.Int2Str(mtpsapi.OrderStatusDeliverred): // 送达
-				continue
-			case utils.Int2Str(mtpsapi.OrderStatusAccepted): // 接单
-				// 接单取消扣凉快
-				return 200, nil
-			case utils.Int2Str(mtpsapi.OrderStatusPickedUp): // 取货
-				bill, err := partner.CurOrderManager.LoadWaybill(deliverId, model.VendorIDMTPS)
-				if err != nil {
-					return 0, err
-				}
-				return bill.DesiredFee, nil
-
-			}
+	for i := len(statusList) - 1; i >= 0; i-- {
+		// 取消不管
+		if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusCanceled) {
+			continue
+		}
+		// 送达
+		if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusDeliverred) {
+			return bill.DesiredFee, nil
+		}
+		// 到店
+		if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusPickedUp) {
+			return bill.DesiredFee, nil
+		}
+		// 接单
+		if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusAccepted) {
+			return 200, nil
+		}
+		// 待调度
+		if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusWaitingForSchedule) {
+			return 0, nil
 		}
-
 	}
 	return 0, err
 }