- 重构创建运单策略

2019-03-30 15:00:59 +08:00
parent 68b5ec38b6
commit 10a444c895
11 changed files with 142 additions and 125 deletions
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -19,9 +19,8 @@ import (
 )

 const (
-	maxOrderPrice   = 6399 // 单位为分，达达最大价格，超过这个价格配送费会增加
-	maxOrderWeight  = 5000 // 5公斤
-	maxDiffFee2Mtps = 150  // 与美团配送最多差价
+	maxOrderPrice  = 6399 // 单位为分，达达最大价格，超过这个价格配送费会增加
+	maxOrderWeight = 5000 // 5公斤
 )

 var (
@@ -102,16 +101,14 @@ 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) {
+func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (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
-		}
+	if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, deliveryFee, order, model.VendorIDDada); err != nil {
+		return nil, err
 	}
 	billParams := &dadaapi.OperateOrderRequiredParams{
 		// ShopNo:          utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的
@@ -158,9 +155,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
 						return nil, err
 					}
 					dadaFee := jxutils.StandardPrice2Int(result.Fee)
-					if dadaFee-deliveryFee > maxDiffFee2Mtps {
-						globals.SugarLogger.Infof("CreateWaybill orderID:%s 达达与美团配送超价太多，达达:%d，美团配送:%d", order.VendorOrderID, dadaFee, deliveryFee)
-						return nil, ErrExceedMaxDiffFee2Mtps
+					if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
+						return nil, err
 					}
 					err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
 				}
--- a/business/partner/delivery/delivery.go
+++ b/business/partner/delivery/delivery.go
@@ -2,6 +2,7 @@ package delivery

 import (
 	"errors"
+	"fmt"
 	"math"
 	"time"

@@ -17,11 +18,44 @@ import (
 const (
 	warningDistance = 10        // 公里
 	warningWeight   = 50 * 1000 // 克
+	maxDiffFee2Mtps = 150       // 与美团配送最多差价
+	maxAddFee       = 300       // 最大增加费用，单位为分，超过不发三方配送了
 )

-var (
-	ErrStoreNoCoordinate = errors.New("找不到门店的坐标信息")
-)
+func NullCreateWaybillPolicy(refDeliveryFee, refAddFee, deliveryFee int64) (errStr string) {
+	return ""
+}
+
+func DefCreateWaybillPolicy(refDeliveryFee, refAddFee, deliveryFee int64) (errStr string) {
+	if refDeliveryFee-deliveryFee > maxDiffFee2Mtps {
+		errStr = fmt.Sprintf("超参考价太多, 费用:%d，参考价:%d, 最高超价:%d", deliveryFee, refDeliveryFee, maxDiffFee2Mtps)
+	} else if refAddFee > maxAddFee {
+		errStr = fmt.Sprintf("超基础价太多, 当前加价:%d, 最高加价:%d", refAddFee, maxAddFee)
+	}
+	return errStr
+}
+
+func AddPolicy(prevPolicy, newPolicy partner.CreateWaybillPolicy) (outPolicy partner.CreateWaybillPolicy) {
+	return func(refDeliveryFee, refAddFee, deliveryFee int64) (errStr string) {
+		if errStr = prevPolicy(refDeliveryFee, refAddFee, deliveryFee); errStr == "" {
+			errStr = newPolicy(refDeliveryFee, refAddFee, deliveryFee)
+		}
+		return errStr
+	}
+}
+
+func CallCreateWaybillPolicy(policy partner.CreateWaybillPolicy, refDeliveryFee, deliveryFee, addFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) {
+	if policy == nil {
+		policy = NullCreateWaybillPolicy
+	}
+	if errStr := policy(deliveryFee, deliveryFee, addFee); errStr != "" {
+		waybillVendorName := jxutils.GetVendorName(waybillVendorID)
+		errStr = fmt.Sprintf("oderID:%s在平台%s，创建运单出错:%s", order.VendorOrderID, waybillVendorName, errStr)
+		globals.SugarLogger.Debugf("%s CreateWaybill failed with %s", waybillVendorName, errStr)
+		return errors.New(errStr)
+	}
+	return nil
+}

 func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db orm.Ormer) (deliveryFee, addFee int64, err error) {
 	globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s", order.VendorOrderID)
@@ -53,7 +87,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o
 	}
 	if lng == 0 || lat == 0 {
 		globals.SugarLogger.Warnf("calculateDeliveryFee 门店没有坐标信息 orderID:%s", order.VendorOrderID)
-		return 0, 0, ErrStoreNoCoordinate
+		return 0, 0, fmt.Errorf("找不到门店:%d的坐标", jxutils.GetSaleStoreIDFromOrder(order))
 	}
 	lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)

@@ -93,7 +127,7 @@ func CalculateOrderDeliveryFee(order *model.GoodsOrder, billTime time.Time, db o
 	// 	timeAddFee = jxutils.StandardPrice2Int(3)
 	// }
 	addFee = distanceAddFee + weightAddFee + timeAddFee
-	globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s, deliveryFee:%d addFee:%d, distance:%.3fkm distanceAddFee:%d, weight:%dg weightAddFee:%d, time:%d timeAddFee:%d", order.VendorOrderID, deliveryFee, addFee, distance, distanceAddFee, order.Weight, weightAddFee, totalSeconds, timeAddFee)
+	globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s, deliveryFee:%d addFee:%d, distance:%.3fkm distanceAddFee:%d, weight:%dg weightAddFee:%d, time:%s timeAddFee:%d", order.VendorOrderID, deliveryFee, addFee, distance, distanceAddFee, order.Weight, weightAddFee, utils.Time2TimeStr(billTime), timeAddFee)
 	return deliveryFee + addFee, addFee, nil
 }

--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -115,77 +115,75 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (re
 }

 // IDeliveryPlatformHandler
-func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(deliveryFee, addFee int64) error) (bill *model.Waybill, err error) {
+func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.CreateWaybillPolicy) (bill *model.Waybill, err error) {
 	db := orm.NewOrm()
 	deliveryFee, addFee, err := delivery.CalculateOrderDeliveryFee(order, time.Now(), db)
 	if err == nil {
-		if policy != nil {
-			err = policy(deliveryFee, addFee)
+		if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, deliveryFee, order, model.VendorIDMTPS); err != nil {
+			return nil, err
 		}
-		if err == nil {
-			// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
-			lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
-			billParams := &mtpsapi.CreateOrderByShopParam{
-				OrderID:             jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
-				DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid,
-				ReceiverName:        utils.FilterMb4(order.ConsigneeName),
-				ReceiverAddress:     utils.FilterMb4(order.ConsigneeAddress),
-				ReceiverPhone:       order.ConsigneeMobile,
-				CoordinateType:      model.CoordinateTypeMars,
-				ReceiverLng:         jxutils.StandardCoordinate2Int(lngFloat),
-				ReceiverLat:         jxutils.StandardCoordinate2Int(latFloat),
-				GoodsValue:          jxutils.IntPrice2Standard(order.ActualPayPrice), // todo 超价处理
-				GoodsWeight:         float64(jxutils.IntWeight2Float(limitOrderWeight(order.Weight))),
-				// ExpectedDeliveryTime: order.ExpectedDeliveredTime.Unix(),
-				OrderType: mtpsapi.OrderTypeASAP,
-			}
-			if billParams.DeliveryID, err = c.getDeliveryID(order, db); err == nil {
-				if billParams.ShopID, err = c.getMTPSShopID(order, db); err == nil {
-					globals.SugarLogger.Debug(billParams.ShopID)
-					goods := &mtpsapi.GoodsDetail{
-						Goods: []*mtpsapi.GoodsItem{},
+		// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
+		lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)
+		billParams := &mtpsapi.CreateOrderByShopParam{
+			OrderID:             jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID),
+			DeliveryServiceCode: mtpsapi.DeliveryServiceCodeRapid,
+			ReceiverName:        utils.FilterMb4(order.ConsigneeName),
+			ReceiverAddress:     utils.FilterMb4(order.ConsigneeAddress),
+			ReceiverPhone:       order.ConsigneeMobile,
+			CoordinateType:      model.CoordinateTypeMars,
+			ReceiverLng:         jxutils.StandardCoordinate2Int(lngFloat),
+			ReceiverLat:         jxutils.StandardCoordinate2Int(latFloat),
+			GoodsValue:          jxutils.IntPrice2Standard(order.ActualPayPrice), // todo 超价处理
+			GoodsWeight:         float64(jxutils.IntWeight2Float(limitOrderWeight(order.Weight))),
+			// ExpectedDeliveryTime: order.ExpectedDeliveredTime.Unix(),
+			OrderType: mtpsapi.OrderTypeASAP,
+		}
+		if billParams.DeliveryID, err = c.getDeliveryID(order, db); err == nil {
+			if billParams.ShopID, err = c.getMTPSShopID(order, db); err == nil {
+				globals.SugarLogger.Debug(billParams.ShopID)
+				goods := &mtpsapi.GoodsDetail{
+					Goods: []*mtpsapi.GoodsItem{},
+				}
+				goodItemMap := map[string]*mtpsapi.GoodsItem{}
+				for _, sku := range order.Skus {
+					goodItem := &mtpsapi.GoodsItem{
+						GoodCount: sku.Count,
+						GoodPrice: jxutils.IntPrice2Standard(sku.SalePrice),
 					}
-					goodItemMap := map[string]*mtpsapi.GoodsItem{}
-					for _, sku := range order.Skus {
-						goodItem := &mtpsapi.GoodsItem{
-							GoodCount: sku.Count,
-							GoodPrice: jxutils.IntPrice2Standard(sku.SalePrice),
-						}
-						goodItem.GoodName, goodItem.GoodUnit = jxutils.GetNameAndUnitFromSkuName(sku.SkuName)
-						// 好像SKU名不能重复，否则会报错，尝试处理一下
-						if item, ok := goodItemMap[goodItem.GoodName]; !ok {
-							goods.Goods = append(goods.Goods, goodItem)
-							goodItemMap[goodItem.GoodName] = goodItem
-						} else {
-							item.GoodCount += goodItem.GoodCount
-						}
-					}
-					addParams := map[string]interface{}{
-						"note":              utils.FilterMb4(order.BuyerComment),
-						"goods_detail":      string(utils.MustMarshal(goods)),
-						"goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq),
-						"poi_seq":           fmt.Sprintf("#%d", order.OrderSeq),
-					}
-					result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
-					if err = err2; err != nil {
-						globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
-
-						tmpLog := &legacymodel.TempLog{
-							VendorOrderID:    order.VendorOrderID,
-							RefVendorOrderID: order.VendorOrderID,
-							IntValue1:        addFee,
-							Msg:              fmt.Sprintf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err),
-						}
-						db.Insert(tmpLog)
+					goodItem.GoodName, goodItem.GoodUnit = jxutils.GetNameAndUnitFromSkuName(sku.SkuName)
+					// 好像SKU名不能重复，否则会报错，尝试处理一下
+					if item, ok := goodItemMap[goodItem.GoodName]; !ok {
+						goods.Goods = append(goods.Goods, goodItem)
+						goodItemMap[goodItem.GoodName] = goodItem
 					} else {
-						bill = &model.Waybill{
-							VendorOrderID:    order.VendorOrderID,
-							OrderVendorID:    order.VendorID,
-							VendorWaybillID:  result.MtPeisongID,
-							VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
-							WaybillVendorID:  model.VendorIDMTPS,
-							DesiredFee:       deliveryFee,
-						}
+						item.GoodCount += goodItem.GoodCount
+					}
+				}
+				addParams := map[string]interface{}{
+					"note":              utils.FilterMb4(order.BuyerComment),
+					"goods_detail":      string(utils.MustMarshal(goods)),
+					"goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq),
+					"poi_seq":           fmt.Sprintf("#%d", order.OrderSeq),
+				}
+				result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
+				if err = err2; err != nil {
+					globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
+
+					tmpLog := &legacymodel.TempLog{
+						VendorOrderID:    order.VendorOrderID,
+						RefVendorOrderID: order.VendorOrderID,
+						IntValue1:        addFee,
+						Msg:              fmt.Sprintf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err),
+					}
+					db.Insert(tmpLog)
+				} else {
+					bill = &model.Waybill{
+						VendorOrderID:    order.VendorOrderID,
+						OrderVendorID:    order.VendorID,
+						VendorWaybillID:  result.MtPeisongID,
+						VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
+						WaybillVendorID:  model.VendorIDMTPS,
+						DesiredFee:       deliveryFee,
 					}
 				}
 			}