修改配送费收取规则

business/partner/delivery/fn/waybill.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"strings"
 	"time"
 
@@ -415,16 +416,49 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 		return 0, err
 	}
 
+	// 本地状态兑换金额
+	var localPrice int64 = 0
+	orderStatus, err := orderman.FixedOrderManager.GetWayBillStatusList(orderId, deliverId, model.VendorIDFengNiao)
+	if err != nil {
+		return 0, err
+	}
+	for i := len(orderStatus) - 1; i >= 0; i-- {
+		if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAcceptCacle) {
+			continue
+		}
+		if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusArrived) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusDelivering) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusDelivered) {
+			localPrice = order.OrderTotalAmountCent
+			break
+		}
+		if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAssigned) {
+			nowTime := time.Now().Unix()
+			fetchTime := orderStatus[i].StatusTime.Unix()
+			timeDiffer := nowTime - fetchTime
+			if timeDiffer > 15*60 || timeDiffer < 60 {
+				localPrice = 0
+			} else {
+				localPrice = 200
+			}
+			break
+		}
+		if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAcceptCreate) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAccept) {
+			localPrice = 0
+			break
+		}
+	}
+
 	// 已经分配骑手,且超过十五分钟,不扣款
+	var vendorPrice int64 = 0
 	if len(order.EventLogDetails) != model.NO {
 		for i := len(order.EventLogDetails) - 1; i >= 0; i-- {
 			switch order.EventLogDetails[i].OrderStatus {
 			case fnpsapi.OrderStatusDelivered, fnpsapi.OrderStatusArrived, fnpsapi.OrderStatusDelivering: // 送达,到店,配送中 取消订单全额扣款
-				return order.OrderTotalAmountCent, nil
+				vendorPrice = order.OrderTotalAmountCent
+				break
 			case fnpsapi.OrderStatusAcceptCacle, fnpsapi.OrderStatusException: // 取消和异常状态,跳过查看上一状态
 				continue
 			case fnpsapi.OrderStatusAcceptCreate, fnpsapi.OrderStatusAccept: // 生成运单和系统接单取消不扣除费用
-				return 0, nil
+				vendorPrice = 0
 			case fnpsapi.OrderStatusAssigned:
 				if time.Now().UnixNano()/1e6-order.EventLogDetails[i].OccurTime > fnpsapi.WayBillPressureOrderTime {
 					return 0, nil
@@ -433,8 +467,9 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 				}
 			}
 		}
-
 	}
-
-	return 0, err
+	if localPrice > vendorPrice {
+		return localPrice, nil
+	}
+	return vendorPrice, nil
 }