- refactor CalculateOrderDeliveryFee

- use QueryDeliverFee and AddOrderAfterQuery for dada

business/partner/delivery/dada/waybill.go

@@ -3,6 +3,7 @@ package dada
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -10,6 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
@@ -17,12 +19,14 @@ import (
 )
 
 const (
-	maxOrderPrice  = 6399 // 单位为分，达达最大价格，超过这个价格配送费会增加
-	maxOrderWeight = 5000 // 5公斤
+	maxOrderPrice   = 6399 // 单位为分，达达最大价格，超过这个价格配送费会增加
+	maxOrderWeight  = 5000 // 5公斤
+	maxDiffFee2Mtps = 100  // 与美团配送最多差价
 )
 
 var (
 	ErrCanNotFindDadaCityCode = errors.New("不能找到美团配送站点配置")
+	ErrExceedMaxDiffFee2Mtps  = errors.New("与美团配送超价太多")
 )
 
 var (
@@ -59,6 +63,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap
 		order.Status = model.WaybillStatusNew
 	case dadaapi.OrderStatusAccepted:
 		if result, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil {
+			order.ActualFee = jxutils.StandardPrice2Int(utils.Interface2FloatWithDefault(result["actualFee"], 0.0))
 			order.DesiredFee = jxutils.StandardPrice2Int(utils.Interface2FloatWithDefault(result["deliveryFee"], 0.0))
 		}
 		order.Status = model.WaybillStatusAccepted
@@ -98,6 +103,16 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal
 
 // IDeliveryPlatformHandler
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(deliveryFee, addFee int64) error) (bill *model.Waybill, err error) {
+	db := orm.NewOrm()
+	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
+	if err != nil {
+		return nil, err
+	}
+	if policy != nil {
+		if err = policy(deliveryFee, addFee); err != nil {
+			return nil, err
+		}
+	}
 	billParams := &dadaapi.OperateOrderRequiredParams{
 		// ShopNo:          utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的
 		OriginID:        jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
@@ -107,7 +122,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
 		ReceiverAddress: utils.FilterMb4(order.ConsigneeAddress),
 		ReceiverPhone:   order.ConsigneeMobile,
 	}
-	db := orm.NewOrm()
 	if billParams.ShopNo, err = c.getDadaShopID(order, db); err == nil {
 		if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil {
 			billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
@@ -137,7 +151,18 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
 				if err2 != nil {
 					globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err2)
 				}
-				result, err = api.DadaAPI.AddOrder(billParams, addParams)
+				if false {
+					result, err = api.DadaAPI.AddOrder(billParams, addParams)
+				} else {
+					if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
+						return nil, err
+					}
+					if jxutils.StandardPrice2Int(result.Fee)-deliveryFee > maxDiffFee2Mtps {
+						globals.SugarLogger.Infof("CreateWaybill orderID:%s 达达与美团配送超价太多，达达:%d，美团配送:%d", order.VendorOrderID, result.Fee, deliveryFee)
+						return nil, ErrExceedMaxDiffFee2Mtps
+					}
+					err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
+				}
 			}
 			if err == nil && result != nil {
 				bill = &model.Waybill{