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

business/jxcallback/orderman/orderman_ext.go

@@ -510,6 +510,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 							paramDamages := []interface{}{v.VendorOrderID, model.OrderStatusCanceled}
 							if err := dao.GetRow(dao.GetDB(), damages, sqlDamages, paramDamages); err == nil {
 								v.LiquidatedDamages = damages.Damages
+								v.DesiredFee += damages.Damages
 							}
 							orders2 = append(orders2, v)
 						} else {

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -500,6 +500,9 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
 									}
 								} else {
 									feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛
+									if storeCourier.VendorID == model.VendorIDFengNiao {
+										feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 蜂鸟加
+									}
 									feeInfo.TimeoutSecond = timeoutSecond
 								}
 							} else {

business/jxstore/cms/store.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/business/partner/delivery/mtps"
 	"io"
 	"math"
 	"mime/multipart"
@@ -2218,20 +2217,34 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) {
 
 func UpdateStoreName() error {
 	var db = dao.GetDB()
-	sql := ` SELECT * FROM store_courier_map WHERE vendor_id = ? AND deleted_at = ?`
+	sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?`
-	data := make([]*model.StoreCourierMap, 0, 0)
+	courierList := make([]*model.StoreCourierMap, 0, 0)
-	if err := dao.GetRows(db, &data, sql, []interface{}{model.VendorIDMTPS, utils.DefaultTimeValue}...); err != nil {
+	if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil {
 		globals.SugarLogger.Debugf("query Order err := %v", err)
 		return err
 	}
-	for _, v := range data {
-		storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS)
-		formalizeStore4Courier(storeDetail)
-		if err := mtps.UpdateStoreName(v.VendorStoreID, storeDetail.Name); err != nil {
-			globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), v.VendorStoreID, storeDetail.Name)
-		}
-	}
 
+	work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+		var resultList []interface{}
+		storeCourier := batchItemList[0].(*model.StoreCourierMap)
+		errList := errlist.New()
+		db := dao.GetDB()
+
+		storeDetail, _ := dao.GetStoreDetail2(db, storeCourier.StoreID, storeCourier.VendorStoreID, storeCourier.VendorID)
+		formalizeStore4Courier(storeDetail)
+		if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil {
+			if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil {
+				if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil {
+					errList.AddErr(err)
+					globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), storeDetail.VendorStoreID, storeDetail.Name)
+				}
+			}
+		}
+		return resultList, errList.GetErrListAsOne()
+	}
+	// 定时任务更新或者创建时修改东西
+	task := tasksch.NewParallelTask("UpdateStoreName", tasksch.NewParallelConfig().SetIsContinueWhenError(false), jxcontext.AdminCtx, work, courierList)
+	tasksch.HandleTask(task, nil, len(courierList) > 1).Run()
 	return nil
 }
 

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 {