- order manager added.

business/jxcallback/scheduler/defsch/defsch.go

@@ -1,6 +1,7 @@
 package defsch
 
 import (
+	"errors"
 	"fmt"
 	"math/rand"
 	"time"
@@ -34,6 +35,14 @@ const (
 	orderMapStoreMaxTime = 4 * 24 * time.Hour // cache最长存储时间
 )
 
+const (
+	maxAddFee = 200 // 最大增加费用，单位为分，超过不发三方配送了
+)
+
+var (
+	ErrAddFeeExceeded = errors.New("配送超过基准价太多")
+)
+
 type WatchOrderInfo struct {
 	autoPickupTimeoutMinute int // 0表示禁用，1表示用缺省值time2AutoPickupMin，其它表示分钟数
 	storeDeliveryType       int
@@ -133,6 +142,7 @@ func init() {
 	sch := &DefScheduler{}
 	sch.IsReallyCallPlatformAPI = globals.ReallyCallPlatformAPI
 	sch.Init()
+	basesch.FixedBaseScheduler = &sch.BaseScheduler
 	scheduler.CurrentScheduler = sch
 	sch.defWorkflowConfig = []map[int]*StatusActionConfig{
 		map[int]*StatusActionConfig{
@@ -405,8 +415,24 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 			if savedOrderInfo.retryCount <= maxWaybillRetryCount {
 				successCount := 0
 				for _, vendorID := range savedOrderInfo.supported3rdCarriers {
-					if s.DeliveryPlatformHandlers[vendorID] != nil && s.DeliveryPlatformHandlers[vendorID].Use4CreateWaybill && savedOrderInfo.waybills[vendorID] == nil && (excludeBill == nil || vendorID != excludeBill.WaybillVendorID) {
-						if err = s.CreateWaybill(vendorID, order); err == nil {
+					handlerInfo := s.GetDeliveryPlatformFromVendorID(vendorID)
+					if handlerInfo != nil && handlerInfo.Use4CreateWaybill && savedOrderInfo.waybills[vendorID] == nil && (excludeBill == nil || vendorID != excludeBill.WaybillVendorID) {
+						if _, err = s.CreateWaybill(vendorID, order, func(deliveryFee, addFee int64) error {
+							if addFee > maxAddFee {
+								db := orm.NewOrm()
+								globals.SugarLogger.Infof("CreateWaybill orderID:%s addFee exceeded too much, it's %d", order.VendorOrderID, addFee)
+
+								tmpLog := &legacymodel.TempLog{
+									VendorOrderID:    order.VendorOrderID,
+									RefVendorOrderID: order.VendorOrderID,
+									IntValue1:        addFee,
+									Msg:              fmt.Sprintf("CreateWaybill orderID:%s addFee exceeded too much, it's %d", order.VendorOrderID, addFee),
+								}
+								db.Insert(tmpLog)
+								return ErrAddFeeExceeded
+							}
+							return nil
+						}); err == nil {
 							successCount++
 						}
 					}