From d40186e930ea39a6a93b4599e255061fea4d4484 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 17 Aug 2018 13:59:15 +0800 Subject: [PATCH] - refactor file structure. --- .../orderman}/order.go | 32 ++++------- .../orderman}/order_legacy.go | 8 +-- .../orderman/orderman.go} | 27 +++++---- .../orderman}/waybill.go | 20 ++----- .../scheduler/defsch/defsch.go | 10 ++-- .../{ => jxcallback}/scheduler/scheduler.go | 55 +++---------------- .../delivery}/dada/waybill.go | 8 +-- .../delivery}/dada/waybill_test.go | 4 +- .../delivery}/mtps/waybill.go | 12 ++-- .../delivery}/mtps/waybill_test.go | 4 +- business/partner/partner.go | 52 ++++++++++++++++++ .../purchase}/elm/elm.go | 0 .../purchase}/elm/order.go | 18 +++--- .../purchase}/elm/order_legacy.go | 9 +-- .../purchase}/elm/order_test.go | 1 + .../purchase}/elm/waybill.go | 4 +- .../purchase}/jd/order.go | 14 ++--- .../purchase}/jd/order_legacy.go | 0 .../purchase}/jd/order_test.go | 8 +-- .../purchase}/jd/waybill.go | 4 +- controllers/dada_order.go | 2 +- controllers/elm_order.go | 2 +- controllers/jd_order.go | 2 +- controllers/mtps_order.go | 2 +- main.go | 5 +- 25 files changed, 153 insertions(+), 150 deletions(-) rename business/{controller => jxcallback/orderman}/order.go (91%) rename business/{controller => jxcallback/orderman}/order_legacy.go (96%) rename business/{controller/controller.go => jxcallback/orderman/orderman.go} (86%) rename business/{controller => jxcallback/orderman}/waybill.go (83%) rename business/{ => jxcallback}/scheduler/defsch/defsch.go (99%) rename business/{ => jxcallback}/scheduler/scheduler.go (83%) rename business/{controller => partner/delivery}/dada/waybill.go (95%) rename business/{controller => partner/delivery}/dada/waybill_test.go (86%) rename business/{controller => partner/delivery}/mtps/waybill.go (96%) rename business/{controller => partner/delivery}/mtps/waybill_test.go (87%) create mode 100644 business/partner/partner.go rename business/{controller => partner/purchase}/elm/elm.go (100%) rename business/{controller => partner/purchase}/elm/order.go (96%) rename business/{controller => partner/purchase}/elm/order_legacy.go (99%) rename business/{controller => partner/purchase}/elm/order_test.go (92%) rename business/{controller => partner/purchase}/elm/waybill.go (94%) rename business/{controller => partner/purchase}/jd/order.go (96%) rename business/{controller => partner/purchase}/jd/order_legacy.go (100%) rename business/{controller => partner/purchase}/jd/order_test.go (79%) rename business/{controller => partner/purchase}/jd/waybill.go (93%) diff --git a/business/controller/order.go b/business/jxcallback/orderman/order.go similarity index 91% rename from business/controller/order.go rename to business/jxcallback/orderman/order.go index 16cc181f0..81006a034 100644 --- a/business/controller/order.go +++ b/business/jxcallback/orderman/order.go @@ -1,4 +1,4 @@ -package controller +package orderman import ( "fmt" @@ -6,22 +6,14 @@ import ( "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" ) -// 所有公共接口调用前，要求在order里或status中设置合适的Status -type OrderController struct { -} - -func NewOrderManager() *OrderController { - return &OrderController{} -} - -func (c *OrderController) LoadPendingOrders() []*model.GoodsOrder { +func (c *OrderManager) LoadPendingOrders() []*model.GoodsOrder { db := orm.NewOrm() var orders []*model.GoodsOrder tillTime := time.Now().Add(-pendingOrderGapMax) @@ -46,7 +38,7 @@ func (c *OrderController) LoadPendingOrders() []*model.GoodsOrder { // msgVendorStatus的意思是事件本身的类型，类似有时收到NewOrder事件去取，订单状态不一定就是New的 // OnOrderAdjust也类似，而OrderStatus要记录的是消息，所以添加这个 -func (c *OrderController) OnOrderNew(order *model.GoodsOrder, msgVendorStatus string) (err error) { +func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus string) (err error) { // todo transaction db := orm.NewOrm() if order.Status == model.OrderStatusUnknown { @@ -65,7 +57,7 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder, msgVendorStatus st } // todo 调整单的处理可能还需要再细化一点，当前只是简单的删除重建 -func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus string) (err error) { +func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus string) (err error) { // todo transaction db := orm.NewOrm() if order.Status == model.OrderStatusUnknown { @@ -99,7 +91,7 @@ func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus return err } -func (c *OrderController) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) { +func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) { isDuplicated, err := c.addOrderStatus(orderStatus, nil) if err == nil && !isDuplicated { err = scheduler.CurrentScheduler.OnOrderStatusChanged(orderStatus, false) @@ -111,7 +103,7 @@ func (c *OrderController) OnOrderStatusChanged(orderStatus *model.OrderStatus) ( } // private -func (c *OrderController) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) { +func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.Ormer) (isDuplicated bool, err error) { // 忽略查找JX信息错误 c.updateOrderOtherInfo(order, db) order.ID = 0 @@ -170,7 +162,7 @@ func (c *OrderController) saveOrder(order *model.GoodsOrder, isAdjust bool, db o return isDuplicated, err } -func (c *OrderController) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) { +func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) { jxStoreID := jxutils.GetJxStoreIDFromOrder(order) if jxStoreID == 0 { globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) @@ -245,7 +237,7 @@ func (c *OrderController) updateOrderSkuOtherInfo(order *model.GoodsOrder, db or return err } -func (c *OrderController) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) { +func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) { var sql string if order.VendorID == model.VendorIDJD { sql = ` @@ -274,7 +266,7 @@ func (c *OrderController) updateOrderOtherInfo(order *model.GoodsOrder, db orm.O return err } -func (c *OrderController) addOrderStatus(orderStatus *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) { +func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) { if db == nil { db = orm.NewOrm() } @@ -329,7 +321,7 @@ func (c *OrderController) addOrderStatus(orderStatus *model.OrderStatus, db orm. return isDuplicated, err } -func (c *OrderController) LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) { +func (c *OrderManager) LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) { db := orm.NewOrm() order = &model.GoodsOrder{ VendorOrderID: vendorOrderID, @@ -348,7 +340,7 @@ func (c *OrderController) LoadOrder(vendorOrderID string, vendorID int) (order * } //Waybill -func (c *OrderController) UpdateWaybillVendorID(bill *model.Waybill, revertStatus bool) (err error) { +func (c *OrderManager) UpdateWaybillVendorID(bill *model.Waybill, revertStatus bool) (err error) { globals.SugarLogger.Debugf("UpdateWaybillVendorID bill:%v", bill) db := orm.NewOrm() params := orm.Params{ diff --git a/business/controller/order_legacy.go b/business/jxcallback/orderman/order_legacy.go similarity index 96% rename from business/controller/order_legacy.go rename to business/jxcallback/orderman/order_legacy.go index a6e61b179..b77f707c5 100644 --- a/business/controller/order_legacy.go +++ b/business/jxcallback/orderman/order_legacy.go @@ -1,4 +1,4 @@ -package controller +package orderman import ( "strings" @@ -124,7 +124,7 @@ func legacyMapWaybillStatus(status int) (retVal int8) { return retVal } -func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Ormer, isDelFirst bool) (err error) { +func (c *OrderManager) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Ormer, isDelFirst bool) (err error) { var result map[string]interface{} businessTags := "" if order.VendorID == model.VendorIDJD && utils.UnmarshalUseNumber([]byte(order.OriginalData), &result) == nil { @@ -223,7 +223,7 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm return err } -func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) { +func (c *OrderManager) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) { orderStatus := legacyMapOrderStatus(status.Status) if orderStatus != JX_STATUS_UNKNOWN { if status.VendorID == model.VendorIDELM { @@ -268,7 +268,7 @@ func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, return err } -func (c *WaybillController) legacyWaybillStatusChanged(bill *model.Waybill, db orm.Ormer) (err error) { +func (c *OrderManager) legacyWaybillStatusChanged(bill *model.Waybill, db orm.Ormer) (err error) { deliveryStatus := legacyMapWaybillStatus(bill.Status) if deliveryStatus != JX_STATUS_UNKNOWN { if db == nil { diff --git a/business/controller/controller.go b/business/jxcallback/orderman/orderman.go similarity index 86% rename from business/controller/controller.go rename to business/jxcallback/orderman/orderman.go index 6edca7dc6..83e84325c 100644 --- a/business/controller/controller.go +++ b/business/jxcallback/orderman/orderman.go @@ -1,14 +1,15 @@ -package controller +package orderman import ( "sort" "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" + _ "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch" // 导入缺省订单调度器 "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" - _ "git.rosy.net.cn/jx-callback/business/scheduler/defsch" // 导入缺省订单调度器 + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" ) @@ -20,10 +21,17 @@ const ( ) var ( - OrderManager *OrderController - WaybillManager *WaybillController + CurOrderManager *OrderManager ) +// 所有公共接口调用前，要求在order里或status中设置合适的Status +type OrderManager struct { +} + +func NewOrderManager() *OrderManager { + return &OrderManager{} +} + type StatusTimer interface { GetStatusTime() time.Time } @@ -45,9 +53,8 @@ func (s StatusTimerSlice) Swap(i, j int) { } func init() { - OrderManager = NewOrderManager() - WaybillManager = NewWaybillManager() - scheduler.CurrentScheduler.RegisterOrderManager(OrderManager) + CurOrderManager = NewOrderManager() + partner.Init(CurOrderManager) } func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) { @@ -79,12 +86,12 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica // todo 最好还是改成全事件回放算了 func LoadPendingOrders() { - orders := OrderManager.LoadPendingOrders() + orders := CurOrderManager.LoadPendingOrders() globals.SugarLogger.Infof("LoadPendingOrders orders count:%d", len(orders)) ordersCount := len(orders) if ordersCount > 0 { - bills := WaybillManager.LoadPendingWaybills() + bills := CurOrderManager.LoadPendingWaybills() globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills)) var sortOrders StatusTimerSlice for _, order := range orders { diff --git a/business/controller/waybill.go b/business/jxcallback/orderman/waybill.go similarity index 83% rename from business/controller/waybill.go rename to business/jxcallback/orderman/waybill.go index d16e2f171..618757907 100644 --- a/business/controller/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -1,24 +1,16 @@ -package controller +package orderman import ( "time" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" ) -// 所有公共接口调用前，要求在order里或status中设置合适的Status -type WaybillController struct { -} - -func NewWaybillManager() *WaybillController { - return &WaybillController{} -} - -func (w *WaybillController) LoadPendingWaybills() []*model.Waybill { +func (w *OrderManager) LoadPendingWaybills() []*model.Waybill { db := orm.NewOrm() var bills []*model.Waybill tillTime := time.Now().Add(-pendingOrderGapMax) @@ -39,7 +31,7 @@ func (w *WaybillController) LoadPendingWaybills() []*model.Waybill { return bills } -func (w *WaybillController) onWaybillNew(bill2 *model.Waybill, db orm.Ormer) (isDuplicated bool, err error) { +func (w *OrderManager) onWaybillNew(bill2 *model.Waybill, db orm.Ormer) (isDuplicated bool, err error) { globals.SugarLogger.Debugf("onWaybillNew bill:%v", bill2) isDuplicated, err = addOrderOrWaybillStatus(model.Waybill2Status(bill2), db) if err == nil && !isDuplicated { @@ -71,7 +63,7 @@ func (w *WaybillController) onWaybillNew(bill2 *model.Waybill, db orm.Ormer) (is return isDuplicated, err } -func (w *WaybillController) OnWaybillStatusChanged(bill *model.Waybill) (err error) { +func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { var isDuplicated bool db := orm.NewOrm() if bill.Status == model.WaybillStatusNew { @@ -96,7 +88,7 @@ func (w *WaybillController) OnWaybillStatusChanged(bill *model.Waybill) (err err return err } -func (w *WaybillController) addWaybillStatus(bill *model.Waybill, db orm.Ormer, addParams orm.Params) (isDuplicated bool, err error) { +func (w *OrderManager) addWaybillStatus(bill *model.Waybill, db orm.Ormer, addParams orm.Params) (isDuplicated bool, err error) { waybillStatus := model.Waybill2Status(bill) isDuplicated, err = addOrderOrWaybillStatus(waybillStatus, db) if err == nil && !isDuplicated && waybillStatus.Status > model.WaybillStatusUnknown { // todo 这里应该和addOrderStatus一样的改法，状态不能回绕 diff --git a/business/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go similarity index 99% rename from business/scheduler/defsch/defsch.go rename to business/jxcallback/scheduler/defsch/defsch.go index 5c3d8cec4..3127f8978 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -2,16 +2,16 @@ package defsch import ( "fmt" + "math/rand" "time" - "math/rand" - "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg" "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/orm" ) @@ -503,7 +503,7 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isAutoLo } else { globals.SugarLogger.Infof("loadSavedOrderFromMap order is incomplete, orderID:%s, load it", status.RefVendorOrderID) } - if order, err := s.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil { + if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil { realSavedInfo.SetOrder(order) } else { realSavedInfo.SetOrder(&model.GoodsOrder{ @@ -661,7 +661,7 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa if bill.WaybillVendorID == model.VendorIDUnknown { bill.VendorWaybillID = "" } - s.CurOrderManager.UpdateWaybillVendorID(bill, revertStatus) + partner.CurOrderManager.UpdateWaybillVendorID(bill, revertStatus) order.WaybillVendorID = bill.WaybillVendorID order.VendorWaybillID = bill.VendorWaybillID if revertStatus { diff --git a/business/scheduler/scheduler.go b/business/jxcallback/scheduler/scheduler.go similarity index 83% rename from business/scheduler/scheduler.go rename to business/jxcallback/scheduler/scheduler.go index 21796d725..d3778cec0 100644 --- a/business/scheduler/scheduler.go +++ b/business/jxcallback/scheduler/scheduler.go @@ -7,6 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" ) @@ -42,47 +43,14 @@ var ( ErrOrderIsNotSolid = errors.New("订单是临时订单，不完整，不能用于创建运单") ) -type PurchasePlatformHandler interface { - GetStatusFromVendorStatus(vendorStatus string) int - GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error) - GetStatusActionTimeout(statusType, status int) time.Duration - - AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) - PickupGoods(order *model.GoodsOrder) (err error) - - // 将订单从购物平台配送转为自送 - Swtich2SelfDeliver(order *model.GoodsOrder) (err error) - - // 将订单从购物平台配送转为自送后又送达 - Swtich2SelfDelivered(order *model.GoodsOrder) (err error) - - // 完全自送的门店表示开始配送 - SelfDeliverDelievering(order *model.GoodsOrder) (err error) - - // 完全自送的门店表示配送完成 - SelfDeliverDelievered(order *model.GoodsOrder) (err error) -} - -type DeliveryPlatformHandler interface { - CreateWaybill(order *model.GoodsOrder) (err error) - CancelWaybill(bill *model.Waybill) (err error) -} - type DeliveryPlatformHandlerInfo struct { - Handler DeliveryPlatformHandler + Handler partner.IDeliveryPlatformHandler Use4CreateWaybill bool } -type OrderManager interface { - LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) - // OnOrderStatusChanged(status *model.OrderStatus) (err error) // 此消息是否使用还不确定 - UpdateWaybillVendorID(bill *model.Waybill, revertStatus bool) (err error) -} - type Scheduler interface { - RegisterOrderManager(handler OrderManager) - RegisterPurchasePlatform(vendorID int, handler PurchasePlatformHandler) - RegisterDeliveryPlatform(vendorID int, handler DeliveryPlatformHandler, isUse4CreateWaybill bool) + RegisterPurchasePlatform(vendorID int, handler partner.IPurchasePlatformHandler) + RegisterDeliveryPlatform(vendorID int, handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool) // 以下是订单 OnOrderNew(order *model.GoodsOrder, isPending bool) (err error) @@ -93,22 +61,17 @@ type Scheduler interface { } type BaseScheduler struct { - CurOrderManager OrderManager - PurchasePlatformHandlers map[int]PurchasePlatformHandler + PurchasePlatformHandlers map[int]partner.IPurchasePlatformHandler DeliveryPlatformHandlers map[int]*DeliveryPlatformHandlerInfo IsReallyCallPlatformAPI bool } func (c *BaseScheduler) Init() { - c.PurchasePlatformHandlers = make(map[int]PurchasePlatformHandler) + c.PurchasePlatformHandlers = make(map[int]partner.IPurchasePlatformHandler) c.DeliveryPlatformHandlers = make(map[int]*DeliveryPlatformHandlerInfo) } -func (c *BaseScheduler) RegisterOrderManager(handler OrderManager) { - c.CurOrderManager = handler -} - -func (c *BaseScheduler) RegisterPurchasePlatform(vendorID int, handler PurchasePlatformHandler) { +func (c *BaseScheduler) RegisterPurchasePlatform(vendorID int, handler partner.IPurchasePlatformHandler) { if !(vendorID >= model.VendorIDPurchaseBegin && vendorID <= model.VendorIDPurchaseEnd) { panic(fmt.Sprintf("purchase vendor:%d is illegal", vendorID)) } @@ -118,7 +81,7 @@ func (c *BaseScheduler) RegisterPurchasePlatform(vendorID int, handler PurchaseP c.PurchasePlatformHandlers[vendorID] = handler } -func (c *BaseScheduler) RegisterDeliveryPlatform(vendorID int, handler DeliveryPlatformHandler, isUse4CreateWaybill bool) { +func (c *BaseScheduler) RegisterDeliveryPlatform(vendorID int, handler partner.IDeliveryPlatformHandler, isUse4CreateWaybill bool) { if !(vendorID >= model.VendorIDDeliveryBegin && vendorID <= model.VendorIDDeliveryEnd) { panic(fmt.Sprintf("delivery vendor:%d is illegal", vendorID)) } @@ -131,7 +94,7 @@ func (c *BaseScheduler) RegisterDeliveryPlatform(vendorID int, handler DeliveryP } } -func (c *BaseScheduler) GetPurchasePlatformFromVendorID(vendorID int) PurchasePlatformHandler { +func (c *BaseScheduler) GetPurchasePlatformFromVendorID(vendorID int) partner.IPurchasePlatformHandler { return c.PurchasePlatformHandlers[vendorID] } diff --git a/business/controller/dada/waybill.go b/business/partner/delivery/dada/waybill.go similarity index 95% rename from business/controller/dada/waybill.go rename to business/partner/delivery/dada/waybill.go index abeaebb9e..83b3a443e 100644 --- a/business/controller/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -6,10 +6,10 @@ import ( "git.rosy.net.cn/baseapi/platformapi/dadaapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/orm" @@ -58,7 +58,7 @@ func (c *WaybillController) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dada default: order.Status = model.WaybillStatusUnknown } - return dadaapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status)) + return dadaapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status)) } func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal *model.Waybill) { @@ -81,7 +81,7 @@ func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVa return retVal } -// DeliveryPlatformHandler +// IDeliveryPlatformHandler func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) { billParams := &dadaapi.OperateOrderRequiredParams{ ShopNo: utils.Int2Str(order.StoreID), // 当前达达的门店号与京西是一样的 diff --git a/business/controller/dada/waybill_test.go b/business/partner/delivery/dada/waybill_test.go similarity index 86% rename from business/controller/dada/waybill_test.go rename to business/partner/delivery/dada/waybill_test.go index 6d68f1f93..5e1825226 100644 --- a/business/controller/dada/waybill_test.go +++ b/business/partner/delivery/dada/waybill_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -23,7 +23,7 @@ func init() { func TestCreateWaybill(t *testing.T) { orderID := "817540316000041" - if order, err := controller.OrderManager.LoadOrder(orderID, model.VendorIDJD); err == nil { + if order, err := orderman.CurOrderManager.LoadOrder(orderID, model.VendorIDJD); err == nil { // globals.SugarLogger.Debug(order) c := new(WaybillController) if err = c.CreateWaybill(order); err == nil { diff --git a/business/controller/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go similarity index 96% rename from business/controller/mtps/waybill.go rename to business/partner/delivery/mtps/waybill.go index 1ff11f829..e645bf64f 100644 --- a/business/controller/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -8,11 +8,11 @@ import ( "git.rosy.net.cn/baseapi/platformapi/mtpsapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego" @@ -57,7 +57,7 @@ func (c *WaybillController) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionM StatusTime: utils.Timestamp2Time(msg.Timestamp), } order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(msg.OrderID) - retVal = mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept") + retVal = mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept") }, msg.OrderID) return retVal } @@ -80,7 +80,7 @@ func (c *WaybillController) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg) return mtpsapi.SuccessResponse } - return mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), order.VendorStatus) + return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) } func (c *WaybillController) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (retVal *model.Waybill) { @@ -154,7 +154,7 @@ func (c *WaybillController) calculateOrderDeliveryFee(order *model.GoodsOrder, b } func (c *WaybillController) calculateBillDeliveryFee(bill *model.Waybill) (deliveryFee, addFee int64) { - order, err := controller.OrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID) + order, err := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID) if err != nil { return 0, 0 } @@ -162,7 +162,7 @@ func (c *WaybillController) calculateBillDeliveryFee(bill *model.Waybill) (deliv return deliveryFee, addFee } -// DeliveryPlatformHandler +// IDeliveryPlatformHandler func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) { db := orm.NewOrm() _, addFee, err := c.calculateOrderDeliveryFee(order, time.Now(), db) diff --git a/business/controller/mtps/waybill_test.go b/business/partner/delivery/mtps/waybill_test.go similarity index 87% rename from business/controller/mtps/waybill_test.go rename to business/partner/delivery/mtps/waybill_test.go index a5f6cdc52..2d7363d1e 100644 --- a/business/controller/mtps/waybill_test.go +++ b/business/partner/delivery/mtps/waybill_test.go @@ -3,7 +3,7 @@ package mtps import ( "testing" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -22,7 +22,7 @@ func init() { func TestCreateWaybill(t *testing.T) { orerID := "817109342000022" - order, _ := controller.OrderManager.LoadOrder(orerID, model.VendorIDJD) + order, _ := orderman.CurOrderManager.LoadOrder(orerID, model.VendorIDJD) // globals.SugarLogger.Debug(order) c := new(WaybillController) if err := c.CreateWaybill(order); err != nil { diff --git a/business/partner/partner.go b/business/partner/partner.go new file mode 100644 index 000000000..b16a873a4 --- /dev/null +++ b/business/partner/partner.go @@ -0,0 +1,52 @@ +package partner + +import ( + "time" + + "git.rosy.net.cn/jx-callback/business/model" +) + +var ( + CurOrderManager IOrderManager +) + +type IOrderManager interface { + OnOrderNew(order *model.GoodsOrder, msgVendorStatus string) (err error) + OnOrderAdjust(order *model.GoodsOrder, msgVendorStatus string) (err error) + OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) + + OnWaybillStatusChanged(bill *model.Waybill) (err error) + + LoadOrder(vendorOrderID string, vendorID int) (order *model.GoodsOrder, err error) + UpdateWaybillVendorID(bill *model.Waybill, revertStatus bool) (err error) +} + +type IPurchasePlatformHandler interface { + GetStatusFromVendorStatus(vendorStatus string) int + GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error) + GetStatusActionTimeout(statusType, status int) time.Duration + + AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) + PickupGoods(order *model.GoodsOrder) (err error) + + // 将订单从购物平台配送转为自送 + Swtich2SelfDeliver(order *model.GoodsOrder) (err error) + + // 将订单从购物平台配送转为自送后又送达 + Swtich2SelfDelivered(order *model.GoodsOrder) (err error) + + // 完全自送的门店表示开始配送 + SelfDeliverDelievering(order *model.GoodsOrder) (err error) + + // 完全自送的门店表示配送完成 + SelfDeliverDelievered(order *model.GoodsOrder) (err error) +} + +type IDeliveryPlatformHandler interface { + CreateWaybill(order *model.GoodsOrder) (err error) + CancelWaybill(bill *model.Waybill) (err error) +} + +func Init(curOrderManager IOrderManager) { + CurOrderManager = curOrderManager +} diff --git a/business/controller/elm/elm.go b/business/partner/purchase/elm/elm.go similarity index 100% rename from business/controller/elm/elm.go rename to business/partner/purchase/elm/elm.go diff --git a/business/controller/elm/order.go b/business/partner/purchase/elm/order.go similarity index 96% rename from business/controller/elm/order.go rename to business/partner/purchase/elm/order.go index cd6da03ea..739eb292e 100644 --- a/business/controller/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -11,10 +11,10 @@ import ( "git.rosy.net.cn/baseapi/platformapi/elmapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/legacy/freshfood" ) @@ -102,13 +102,13 @@ func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) ( globals.SugarLogger.Warnf("onOrderStatusMsg elm msg:%v not handled", msg) return elmapi.SuccessResponse } - err := controller.OrderManager.OnOrderStatusChanged(status) + err := partner.CurOrderManager.OnOrderStatusChanged(status) // 直接跳到拣货完成 if msg.MsgType == elmapi.MsgTypeOrderAccepted { status.Status = model.OrderStatusFinishedPickup status.VendorStatus = fakePickedUp - err = controller.OrderManager.OnOrderStatusChanged(status) + err = partner.CurOrderManager.OnOrderStatusChanged(status) } // if globals.HandleLegacyJxOrder && err == nil { // c.legacyElmOrderStatusChanged(status) @@ -126,7 +126,7 @@ func (c *OrderController) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancel default: status.Status = model.OrderStatusUnknown } - return elmapi.Err2CallbackResponse(controller.OrderManager.OnOrderStatusChanged(status), status.VendorStatus) + return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus) } func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err error) { @@ -191,8 +191,8 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err order.Weight += sku.Weight * sku.Count } } + setOrederDetailFee(result, order) } - setOrederDetailFee(result, order) return order, err } @@ -222,7 +222,7 @@ func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elma order, err := c.GetOrder(msg["orderId"].(string)) if err == nil { order.VendorStatus = c.stateAndType2Str(order.VendorStatus, elmapi.MsgTypeOrderValid) - err = controller.OrderManager.OnOrderNew(order, c.stateAndType2Str(msg["status"].(string), elmapi.MsgTypeOrderValid)) + err = partner.CurOrderManager.OnOrderNew(order, c.stateAndType2Str(msg["status"].(string), elmapi.MsgTypeOrderValid)) // if globals.HandleLegacyJxOrder && err == nil { // c.legacyWriteElmOrder(order) // } @@ -244,7 +244,7 @@ func (c *OrderController) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg) if globals.ReallyCallPlatformAPI { freshfood.FreshFoodAPI.ELMClientUrgeOrder(msg.OrderID) } - return elmapi.Err2CallbackResponse(controller.OrderManager.OnOrderStatusChanged(status), status.VendorStatus) + return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus) } func (c *OrderController) stateAndType2Str(state string, msgType int) string { @@ -263,7 +263,7 @@ func (c *OrderController) spliltCompositeState(compositeState string) (state str return compositeState, 0 } -// PurchasePlatformHandler +// IPurchasePlatformHandler func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int { state, _ := c.spliltCompositeState(vendorStatus) if status, ok := VendorStatus2StatusMap[state]; ok { diff --git a/business/controller/elm/order_legacy.go b/business/partner/purchase/elm/order_legacy.go similarity index 99% rename from business/controller/elm/order_legacy.go rename to business/partner/purchase/elm/order_legacy.go index 18640703c..99bf60096 100644 --- a/business/controller/elm/order_legacy.go +++ b/business/partner/purchase/elm/order_legacy.go @@ -1,14 +1,11 @@ package elm import ( - "github.com/astaxie/beego/orm" - - "git.rosy.net.cn/jx-callback/business/legacymodel" - - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/legacymodel" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals" + "github.com/astaxie/beego/orm" ) // 为了兼容之前的表，造出原来需要的数据 diff --git a/business/controller/elm/order_test.go b/business/partner/purchase/elm/order_test.go similarity index 92% rename from business/controller/elm/order_test.go rename to business/partner/purchase/elm/order_test.go index 2968fa458..189c85aaa 100644 --- a/business/controller/elm/order_test.go +++ b/business/partner/purchase/elm/order_test.go @@ -3,6 +3,7 @@ package elm import ( "testing" + _ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/db" diff --git a/business/controller/elm/waybill.go b/business/partner/purchase/elm/waybill.go similarity index 94% rename from business/controller/elm/waybill.go rename to business/partner/purchase/elm/waybill.go index 3ea36014e..9ee85e9a2 100644 --- a/business/controller/elm/waybill.go +++ b/business/partner/purchase/elm/waybill.go @@ -5,9 +5,9 @@ import ( "git.rosy.net.cn/baseapi/platformapi/elmapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -48,7 +48,7 @@ func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatus // MsgTypeDeiverBySelf order.Status = model.WaybillStatusUnknown } - return elmapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), order.VendorStatus) + return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) } func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatusMsg) (retVal *model.Waybill) { diff --git a/business/controller/jd/order.go b/business/partner/purchase/jd/order.go similarity index 96% rename from business/controller/jd/order.go rename to business/partner/purchase/jd/order.go index 64a9d371d..bedd36d27 100644 --- a/business/controller/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -6,10 +6,10 @@ import ( "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/scheduler" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/legacy/freshfood" @@ -59,7 +59,7 @@ func (c *OrderController) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi freshfood.FreshFoodAPI.JDOrderComment(msg) } } - err := controller.OrderManager.OnOrderStatusChanged(status) + err := partner.CurOrderManager.OnOrderStatusChanged(status) // if globals.HandleLegacyJxOrder && err == nil { // c.legacyJdOrderStatusChanged(status) // } @@ -136,8 +136,8 @@ func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err order.SalePrice += sku.SalePrice * int64(sku.Count) order.Weight += sku.Weight * sku.Count } + setOrederDetailFee(result, order) } - setOrederDetailFee(result, order) return order, err } @@ -151,7 +151,7 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder) func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { order, err := c.GetOrder(msg.BillID) if err == nil { - err = controller.OrderManager.OnOrderNew(order, msg.StatusID) + err = partner.CurOrderManager.OnOrderNew(order, msg.StatusID) // if err == nil { // c.legacyWriteJdOrder(order, false) // } @@ -162,7 +162,7 @@ func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jda func (c *OrderController) onOrderAdjust(msg *jdapi.CallbackOrderMsg) *jdapi.CallbackResponse { order, err := c.GetOrder(msg.BillID) if err == nil { - err = controller.OrderManager.OnOrderAdjust(order, msg.StatusID) + err = partner.CurOrderManager.OnOrderAdjust(order, msg.StatusID) // if globals.HandleLegacyJxOrder && err == nil { // c.legacyWriteJdOrder(order, true) // } @@ -185,7 +185,7 @@ func (c *OrderController) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model return orderStatus } -// PurchasePlatformHandler +// IPurchasePlatformHandler func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int { if status, ok := VendorStatus2StatusMap[vendorStatus]; ok { return status diff --git a/business/controller/jd/order_legacy.go b/business/partner/purchase/jd/order_legacy.go similarity index 100% rename from business/controller/jd/order_legacy.go rename to business/partner/purchase/jd/order_legacy.go diff --git a/business/controller/jd/order_test.go b/business/partner/purchase/jd/order_test.go similarity index 79% rename from business/controller/jd/order_test.go rename to business/partner/purchase/jd/order_test.go index 92d1a9664..fbff2ed90 100644 --- a/business/controller/jd/order_test.go +++ b/business/partner/purchase/jd/order_test.go @@ -3,7 +3,7 @@ package jd import ( "testing" - "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" @@ -22,7 +22,7 @@ func init() { func TestSwitch2SelfDeliver(t *testing.T) { orderID := "817540316000041" - if order, err := controller.OrderManager.LoadOrder(orderID, model.VendorIDJD); err == nil { + if order, err := orderman.CurOrderManager.LoadOrder(orderID, model.VendorIDJD); err == nil { // globals.SugarLogger.Debug(order) c := new(OrderController) if err = c.Swtich2SelfDeliver(order); err == nil { @@ -34,9 +34,9 @@ func TestSwitch2SelfDeliver(t *testing.T) { } } -func Test_GetOrder(t *testing.T) { +func TestGetOrder(t *testing.T) { _, err := new(OrderController).GetOrder("815536199000222") if err != nil { - panic(err.Error()) + t.Fatal(err.Error()) } } diff --git a/business/controller/jd/waybill.go b/business/partner/purchase/jd/waybill.go similarity index 93% rename from business/controller/jd/waybill.go rename to business/partner/purchase/jd/waybill.go index 0aacb59bd..5f7483206 100644 --- a/business/controller/jd/waybill.go +++ b/business/partner/purchase/jd/waybill.go @@ -3,9 +3,9 @@ package jd import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -46,7 +46,7 @@ func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) ( default: order.Status = model.WaybillStatusUnknown } - return jdapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), order.VendorStatus) + return jdapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) } func (c *WaybillController) callbackMsg2Waybill(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *model.Waybill) { diff --git a/controllers/dada_order.go b/controllers/dada_order.go index 0984b6e78..efce331f1 100644 --- a/controllers/dada_order.go +++ b/controllers/dada_order.go @@ -2,7 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller/dada" + "git.rosy.net.cn/jx-callback/business/partner/delivery/dada" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/legacy/dada/controller" diff --git a/controllers/elm_order.go b/controllers/elm_order.go index e33df6d00..aec3e3bf5 100644 --- a/controllers/elm_order.go +++ b/controllers/elm_order.go @@ -3,7 +3,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/elmapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller/elm" + "git.rosy.net.cn/jx-callback/business/partner/purchase/elm" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/legacy/elm/controller" diff --git a/controllers/jd_order.go b/controllers/jd_order.go index 99955466c..6089f3aa3 100644 --- a/controllers/jd_order.go +++ b/controllers/jd_order.go @@ -3,7 +3,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller/jd" + "git.rosy.net.cn/jx-callback/business/partner/purchase/jd" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/legacy/jd/controller" diff --git a/controllers/mtps_order.go b/controllers/mtps_order.go index b8ce08002..9862fe8b4 100644 --- a/controllers/mtps_order.go +++ b/controllers/mtps_order.go @@ -2,7 +2,7 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/controller/mtps" + "git.rosy.net.cn/jx-callback/business/partner/delivery/mtps" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/legacy/mtps/controller" diff --git a/main.go b/main.go index e4ddc5521..0ac6af621 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - bzcon "git.rosy.net.cn/jx-callback/business/controller" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/db" @@ -86,9 +86,8 @@ func main() { if globals.CallLegacyMsgHandler { controller.InitOrder() } + orderman.LoadPendingOrders() } - bzcon.LoadPendingOrders() - if beego.BConfig.RunMode == "dev" { beego.BConfig.WebConfig.DirectoryIndex = true beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"