蜂鸟加四毛,下载excel违约金加在运费上

business/partner/delivery/dada/waybill.go

@@ -624,3 +624,7 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 	}
 	return vendorPrice, nil
 }
+
+func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
+	return err
+}

business/partner/delivery/fn/waybill.go

@@ -344,10 +344,10 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *fnpsapi.AbnormalReportNotify) (re
 	return retVal
 }
 
-// 查询订单配送费
+// 查询订单配送费(蜂鸟加4毛)
 func GetDesiredFee(vendorOrderID string) (desiredFee, acuteFee int64) {
 	if result, err := api.FnAPI.QueryOrder(vendorOrderID); err == nil {
-		return result.OrderTotalAmountCent + int64(utils.WayBillDeliveryMarkUp), result.OrderActualAmountCent
+		return result.OrderTotalAmountCent, result.OrderActualAmountCent
 	}
 	return desiredFee, acuteFee
 }
@@ -473,3 +473,7 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId
 	}
 	return vendorPrice, nil
 }
+
+func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
+	return err
+}

business/partner/delivery/mtps/store.go

@@ -184,7 +184,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S
 }
 
 // 美团配送,修改门店名称
-func UpdateStoreName(storeId, name string) (err error) {
+func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
 	shopInfo := &mtpsapi.ShopInfo{
 		ShopID:   storeId,
 		ShopName: name,

business/partner/delivery/rider.go

@@ -543,6 +543,11 @@ func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWayb
 		}
 
 	}
+	if riderInfo.CourierName != "" && riderInfo.CourierPhone != "" {
+		riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
+	} else {
+		riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, "暂无", "暂无")
+	}
 
 	return
 }

business/partner/delivery/uupt/waybill.go

@@ -404,3 +404,7 @@ func getReallyStoreID(storeID, jxStoreID int) int {
 		return storeID
 	}
 }
+
+func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) {
+	return err
+}

business/partner/partner_delivery.go

@@ -54,6 +54,7 @@ type IDeliveryPlatformHandler interface {
 
 type IDeliveryUpdateStoreHandler interface {
 	UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error)
+	UpdateStoreName(storeId, name string) (err error)
 }
 
 type DeliveryPlatformHandlerInfo struct {