- refactor basesch, move register partner to partner.

2018-10-18 21:18:38 +08:00
parent 294786cb4b
commit 507fcf16d8
13 changed files with 84 additions and 94 deletions
--- a/business/jxcallback/scheduler/basesch/basesch.go
+++ b/business/jxcallback/scheduler/basesch/basesch.go
@@ -1,8 +1,6 @@
 package basesch

 import (
-	"fmt"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -15,47 +13,7 @@ var (
 )

 type BaseScheduler struct {
-	PurchasePlatformHandlers map[int]partner.IPurchasePlatformHandler
-	DeliveryPlatformHandlers map[int]*scheduler.DeliveryPlatformHandlerInfo
-	IsReallyCallPlatformAPI  bool
-}
-
-func (c *BaseScheduler) Init() {
-	c.PurchasePlatformHandlers = make(map[int]partner.IPurchasePlatformHandler)
-	c.DeliveryPlatformHandlers = make(map[int]*scheduler.DeliveryPlatformHandlerInfo)
-}
-
-func (c *BaseScheduler) RegisterPurchasePlatform(handler partner.IPurchasePlatformHandler) {
-	vendorID := handler.GetVendorID()
-	if !(vendorID >= model.VendorIDPurchaseBegin && vendorID <= model.VendorIDPurchaseEnd) {
-		panic(fmt.Sprintf("purchase vendor:%d is illegal", vendorID))
-	}
-	if _, ok := c.PurchasePlatformHandlers[vendorID]; ok {
-		panic(fmt.Sprintf("purchase vendor:%d, already exists", vendorID))
-	}
-	c.PurchasePlatformHandlers[vendorID] = handler
-}
-
-func (c *BaseScheduler) RegisterDeliveryPlatform(handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool) {
-	vendorID := handler.GetVendorID()
-	if !(vendorID >= model.VendorIDDeliveryBegin && vendorID <= model.VendorIDDeliveryEnd) {
-		panic(fmt.Sprintf("delivery vendor:%d is illegal", vendorID))
-	}
-	if _, ok := c.DeliveryPlatformHandlers[vendorID]; ok {
-		panic(fmt.Sprintf("delivery vendor:%d, already exists", vendorID))
-	}
-	c.DeliveryPlatformHandlers[vendorID] = &scheduler.DeliveryPlatformHandlerInfo{
-		Handler:           handler,
-		Use4CreateWaybill: isUse4CreateWaybill,
-	}
-}
-
-func (c *BaseScheduler) GetPurchasePlatformFromVendorID(vendorID int) partner.IPurchasePlatformHandler {
-	return c.PurchasePlatformHandlers[vendorID]
-}
-
-func (c *BaseScheduler) GetDeliveryPlatformFromVendorID(vendorID int) *scheduler.DeliveryPlatformHandlerInfo {
-	return c.DeliveryPlatformHandlers[vendorID]
+	IsReallyCallPlatformAPI bool
 }

 func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
@@ -63,7 +21,7 @@ func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusNew {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogErrorWithInfo(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).AcceptOrRefuseOrder(order, isAcceptIt, userName)
 			}, "AcceptOrRefuseOrder orderID:%s, isAcceptIt:%t", order.VendorOrderID, isAcceptIt)
 		}
 	} else {
@@ -78,7 +36,7 @@ func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder, userName string) (e
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusAccepted {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogErrorWithInfo(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order, userName)
 			}, "PickupGoods orderID:%s", order.VendorOrderID)
 		}
 	} else {
@@ -98,7 +56,7 @@ func (c *BaseScheduler) Swtich2SelfDeliver(order *model.GoodsOrder, userName str
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogErrorWithInfo(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDeliver(order, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDeliver(order, userName)
 			}, "Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
 			if err == nil { // 因为有些平台转自送后，不会再发送订单在配送中消息过来，所以成功后就强制设置状态为配送中
 				order.Status = model.OrderStatusDelivering
@@ -122,7 +80,7 @@ func (c *BaseScheduler) Swtich2SelfDelivered(order *model.GoodsOrder, userName s
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogError(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDelivered(order, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDelivered(order, userName)
 			}, "Swtich2SelfDelivered orderID:%s", order.VendorOrderID)
 		}
 	} else {
@@ -142,7 +100,7 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogError(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName)
 			}, "SelfDeliverDelivering orderID:%s", order.VendorOrderID)
 			if err == nil { // 因为有些平台设置配送中后，不会发送订单在配送中消息过来，所以成功后就强制设置状态为配送中
 				order.Status = model.OrderStatusDelivering
@@ -165,7 +123,7 @@ func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder, userName
 	if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogError(func() error {
-				return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order, userName)
+				return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order, userName)
 			}, "SelfDeliverDelievered orderID:%s", order.VendorOrderID)
 		}
 	} else {
@@ -187,7 +145,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 		return nil, scheduler.ErrOrderIsNotSolid
 	}
 	if c.IsReallyCallPlatformAPI {
-		handlerInfo := c.GetDeliveryPlatformFromVendorID(platformVendorID)
+		handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID)
 		if handlerInfo != nil && handlerInfo.Use4CreateWaybill {
 			bill, err = handlerInfo.Handler.CreateWaybill(order, policy)
 			if err != nil {
@@ -203,7 +161,7 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
 	globals.SugarLogger.Infof("CancelWaybill bill:%v, cancelReasonID:%d cancelReason:%s", bill, cancelReasonID, cancelReason)
 	if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID {
-		if handlerInfo := c.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
+		if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
 			err = utils.CallFuncLogError(func() error {
 				return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason)
 			}, "CancelWaybill bill:%v", bill)
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -186,7 +186,6 @@ func init() {
 	basesch.FixedBaseScheduler = &sch.BaseScheduler
 	FixedScheduler = sch
 	sch.IsReallyCallPlatformAPI = globals.ReallyCallPlatformAPI
-	sch.Init()
 	scheduler.CurrentScheduler = sch
 	sch.defWorkflowConfig = []map[int]*StatusActionConfig{
 		map[int]*StatusActionConfig{
@@ -199,7 +198,7 @@ func init() {
 						if err = sch.AcceptOrRefuseOrder(order, isAcceptIt, ""); err != nil && err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation {
 							// 为了解决京东新消息与接单消息乱序的问题
 							if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 && errWithCode.IntCode() == -1 {
-								if order2, err2 := sch.GetPurchasePlatformFromVendorID(order.VendorID).GetOrder(order.VendorOrderID); err2 == nil && order2.Status > order.Status {
+								if order2, err2 := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetOrder(order.VendorOrderID); err2 == nil && order2.Status > order.Status {
 									sch.OnOrderStatusChanged(model.Order2Status(order2), false)
 									err = nil
 								} else {
@@ -472,7 +471,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 				if savedOrderInfo.retryCount <= maxWaybillRetryCount {
 					successCount := 0
 					for _, vendorID := range savedOrderInfo.supported3rdCarriers {
-						handlerInfo := s.GetDeliveryPlatformFromVendorID(vendorID)
+						handlerInfo := partner.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 {
@@ -736,7 +735,7 @@ func (s *DefScheduler) handleAutoAcceptOrder(orderID string, vendorID int, userM
 }

 func (s *DefScheduler) mergeOrderStatusConfig(statusType, status int, purchaseVendorID int) (retVal *StatusActionConfig) {
-	vendorTimeout := s.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(statusType, status)
+	vendorTimeout := partner.GetPurchasePlatformFromVendorID(purchaseVendorID).GetStatusActionTimeout(statusType, status)
 	defConfig := s.defWorkflowConfig[statusType][status]
 	if defConfig == nil {
 		return nil
--- a/business/jxcallback/scheduler/scheduler.go
+++ b/business/jxcallback/scheduler/scheduler.go
@@ -2,10 +2,8 @@ package scheduler

 import (
 	"errors"
-	"time"

 	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/business/partner"
 )

 const (
@@ -43,15 +41,7 @@ var (
 	ErrDeliverProviderWrong          = errors.New("快递商不存在或不能用于创建运单")
 )

-type DeliveryPlatformHandlerInfo struct {
-	Handler           partner.IDeliveryPlatformHandler
-	Use4CreateWaybill bool
-}
-
 type IScheduler interface {
-	RegisterPurchasePlatform(handler partner.IPurchasePlatformHandler)
-	RegisterDeliveryPlatform(handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool)
-
 	// 以下是订单
 	OnOrderNew(order *model.GoodsOrder, isPending bool) (err error)
 	OnOrderStatusChanged(status *model.OrderStatus, isPending bool) (err error)
@@ -59,10 +49,3 @@ type IScheduler interface {
 	// 以下是运单
 	OnWaybillStatusChanged(bill *model.Waybill, isPending bool) (err error)
 }
-
-type BasePurchasePlatform struct {
-}
-
-func (p *BasePurchasePlatform) GetStatusActionTimeout(statusType, status int) time.Duration {
-	return 0
-}