修改配送价格

business/jxcallback/scheduler/basesch/basesch.go

@@ -176,6 +176,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 	if handlerInfo != nil && handlerInfo.Use4CreateWaybill {
 		if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 && balance >= model.BrandBalanceLimit {
 			if c.IsReallyCallPlatformAPI {
+				// 美团配送订单生成，配送费计算
 				bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
 				if err != nil {
 					globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -184,6 +184,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
 	return nil, err
 }
 
+// 创建三方运单
 func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, courierVendorIDs []int, forceCreate bool, maxDeliveryFee int64) (bills []*model.Waybill, errCode string, err error) {
 	savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
 	if savedOrderInfo != nil {

business/partner/delivery/mtps/waybill.go

@@ -188,7 +188,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 	return deliveryFeeInfo, err
 }
 
-// IDeliveryPlatformHandler
+// IDeliveryPlatformHandler（美团配送）
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
 	db := dao.GetDB()
 	if vendorOrgCode, err := dao.GetVendorOrgCode(db, model.VendorIDMTPS, "", model.VendorOrgTypeDelivery); err == nil {
@@ -200,6 +200,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 	} else {
 		return nil, err
 	}
+
+	// 自定义计算预估费用
 	deliveryFee, _, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
 	if err == nil {
 		if err = delivery.CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee, order, model.VendorIDMTPS); err != nil {
@@ -259,6 +261,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 				billParams.GoodsPickupInfo = fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq)
 				billParams.PoiSeq = fmt.Sprintf("#%d", order.OrderSeq)
 				if globals.EnableStoreWrite {
+					//  通知美团订单，获取返回订单配送费
 					result, err2 := api.MtpsAPI.CreateOrderByShop2(billParams)
 					if err = err2; err == nil {
 						bill = &model.Waybill{
@@ -267,8 +270,10 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 							VendorWaybillID:  result.MtPeisongID,
 							VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
 							WaybillVendorID:  model.VendorIDMTPS,
-							DesiredFee:       deliveryFee,
+							// todo
+							DesiredFee: int64(result.DeliveryFee * 100), // todo deliveryFee,
 						}
+						// 当前运单总费大于配送阈值15，日志打印提示
 						delivery.OnWaybillCreated(bill)
 					} else {
 						globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, error:%v", order.VendorOrderID, billParams, err)

business/partner/delivery/mtps/waybill_test.go

@@ -18,7 +18,7 @@ func TestCreateWaybill(t *testing.T) {
 	order, _ := partner.CurOrderManager.LoadOrder(orerID, model.VendorIDJD)
 	// globals.SugarLogger.Debug(order)
 	c := new(DeliveryHandler)
-	_, err := c.CreateWaybill(order, nil)
+	_, err := c.CreateWaybill(order, 0)
 	if err != nil {
 		t.Fatal(err.Error())
 	}