- 重构创建运单策略

business/partner/purchase/weimob/wsc/order.go

@@ -5,6 +5,8 @@ import (
 	"sort"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/delivery"
+
 	"git.rosy.net.cn/baseapi/platformapi/weimobapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -187,13 +189,7 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDeilivery bool, userName string) (err error) {
 	if globals.EnableStoreWrite && globals.EnableWscStoreWrite && !isSelfDeilivery {
-		_, err = dada.CurDeliveryHandler.CreateWaybill(order, func(deliveryFee, addFee int64) error {
-			if addFee > maxAddFee {
-				globals.SugarLogger.Infof("PickupGoods CreateWaybill orderID:%s addFee exceeded too much deliveryFee:%d, addFee:%d", order.VendorOrderID, deliveryFee, addFee)
-				return errors.New("配送超过基准价太多")
-			}
-			return nil
-		})
+		_, err = dada.CurDeliveryHandler.CreateWaybill(order, delivery.DefCreateWaybillPolicy)
 	}
 	// 微商城没有拣货完成，模拟
 	p.postFakeMsg(utils.Str2Int64(order.VendorOrderID), FakeOrderStatusFinishedPickup)