修改门店发单和品牌发单是扣费问题

business/partner/delivery/dada/waybill.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -540,3 +541,35 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
 	}
 	return result, nil
 }
+
+// GetDeliverLiquidatedDamages 获取达达平台扣除配送费
+// 待接单,待取货(小于一分钟,大于十五分钟)不扣钱
+// 待取货1-15分钟内取消扣两元
+func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) {
+	dadaOrder, err := api.DadaAPI.QueryOrderInfo(orderId)
+	if err != nil {
+		return 0, err
+	}
+
+	// 未接单不扣款
+	if dadaOrder.AcceptTime == "" {
+		return 0, nil
+	}
+
+	// 有了接单时间,订单变成了待取货
+	if dadaOrder.AcceptTime != "" && dadaOrder.FetchTime == "" {
+		nowTime := time.Now().Unix()
+		fetchTime := utils.Str2Time(dadaOrder.AcceptTime).Unix()
+		timeDiffer := nowTime - fetchTime
+		if timeDiffer > 15*60 || timeDiffer < 60 {
+			return 0, nil
+		}
+		return 200, nil
+	}
+
+	if dadaOrder.FetchTime != "" {
+		return jxutils.StandardPrice2Int(dadaOrder.ActualFee), nil
+	}
+
+	return 0, err
+}

business/partner/delivery/fn/waybill.go

@@ -114,6 +114,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 		ReceiverPrimaryPhone:  order.ConsigneeMobile,
 		OutShopCode:           utils.Int2Str(order.JxStoreID),
 		ChainStoreId:          "",
+		SerialNumber:          fmt.Sprintf("%s #%d", model.VendorChineseNames[order.VendorID], order.OrderSeq),
 	}
 	// 重量超标减少配送费
 	weight := 4.9500
@@ -380,3 +381,36 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
 
 	return result, nil
 }
+
+// GetDeliverLiquidatedDamages 获取运单取消违约金
+// 蜂鸟:骑手接单后-取餐之前,每单扣除2元,超过20分钟不扣款
+func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) {
+	// 获取订单状态
+	order, err := api.FnAPI.QueryOrder(orderId)
+	if err != nil {
+		return 0, err
+	}
+
+	// 已经分配骑手,且超过十五分钟,不扣款
+	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.OrderActualAmountCent, nil
+			case fnpsapi.OrderStatusAcceptCacle, fnpsapi.OrderStatusException: // 取消和异常状态,跳过查看上一状态
+				continue
+			case fnpsapi.OrderStatusAcceptCreate, fnpsapi.OrderStatusAccept: // 生成运单和系统接单取消不扣除费用
+				return 0, nil
+			case fnpsapi.OrderStatusAssigned:
+				if time.Now().UnixNano()/1e6-order.EventLogDetails[i].OccurTime > fnpsapi.WayBillPressureOrderTime {
+					return 0, nil
+				} else {
+					return 200, nil
+				}
+			}
+		}
+
+	}
+
+	return 0, err
+}

business/partner/delivery/jdeclp/waybill.go

@@ -107,3 +107,6 @@ func (c *DeliveryHandler) ComplaintRider(bill *model.Waybill, resonID int, reson
 func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) {
 	return nil, nil
 }
+func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) {
+	return 0, err
+}

business/partner/delivery/mtps/waybill.go

@@ -483,3 +483,6 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
 
 	return result, nil
 }
+func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) {
+	return 0, err
+}

business/partner/delivery/rider.go

@@ -96,7 +96,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 		}
 
 		if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
-			waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID)
+			waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil)
 			if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {
 				globals.SugarLogger.Debugf("订单物流状态结束,不在推送订单状态:orderID[%s],wayBillId[%s]", v.VendorOrderID, waybillList[0].VendorWaybillID)
 				continue

business/partner/delivery/uupt/waybill.go

@@ -240,6 +240,10 @@ func (d DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeison
 	return param, nil
 }
 
+func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) {
+	return api.UuAPI.GetOrderLiquidatedDamages(deliverId, orderId)
+}
+
 //辅助函数
 func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceResp, err error) {
 	store, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "")