- continue refactoring...

2018-08-17 16:42:16 +08:00
parent d40186e930
commit c5db19045d
33 changed files with 656 additions and 178 deletions
--- a/business/partner/purchase/elm/elm.go
+++ b/business/partner/purchase/elm/elm.go
@@ -3,14 +3,29 @@ package elm
 import (
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
 	"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"
 )

-type Controller struct {
+var (
+	curPurchaseHandler *PurchaseHandler
+)
+
+type PurchaseHandler struct {
+	scheduler.BasePurchasePlatform
 }

-func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) {
+func init() {
+	curPurchaseHandler = new(PurchaseHandler)
+	scheduler.CurrentScheduler.RegisterPurchasePlatform(model.VendorIDELM, curPurchaseHandler)
+}
+
+func OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) {
+	return curPurchaseHandler.OnCallbackMsg(msg)
+}
+
+func (c *PurchaseHandler) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.CallbackResponse) {
 	if msg.Type == elmapi.MsgTypeOrderValid {
 		innerMsg := make(map[string]interface{})
 		err := utils.UnmarshalUseNumber([]byte(msg.Message), &innerMsg)
@@ -18,7 +33,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 			retVal = elmapi.Err2CallbackResponse(err, "")
 		} else {
 			innerMsg["msgType"] = msg.Type
-			retVal = new(OrderController).OnOrderNewMsg(innerMsg)
+			retVal = c.OnOrderNewMsg(innerMsg)
 		}
 	} else if msg.Type > elmapi.MsgTypeOrderValid && msg.Type < elmapi.MsgTypeUserApplyCancel {
 		var innerMsg elmapi.CallbackOrderStatusMsg
@@ -27,7 +42,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 			retVal = elmapi.Err2CallbackResponse(err, "")
 		} else {
 			innerMsg.MsgType = msg.Type
-			retVal = new(OrderController).OnOrderStatusMsg(&innerMsg)
+			retVal = c.OnOrderStatusMsg(&innerMsg)
 		}
 	} else if msg.Type >= elmapi.MsgTypeUserApplyCancel && msg.Type < elmapi.MsgTypeUserUrgeOrder {
 		var innerMsg elmapi.CallbackOrderCancelRefundMsg
@@ -36,7 +51,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 			retVal = elmapi.Err2CallbackResponse(err, "")
 		} else {
 			innerMsg.MsgType = msg.Type
-			retVal = new(OrderController).OnOrderCancelRefundMsg(&innerMsg)
+			retVal = c.OnOrderCancelRefundMsg(&innerMsg)
 		}
 	} else if msg.Type == elmapi.MsgTypeUserUrgeOrder {
 		var innerMsg elmapi.CallbackOrderUrgeMsg
@@ -46,7 +61,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 		} else {
 			innerMsg.MsgType = msg.Type
 			jxutils.CallMsgHandler(func() {
-				retVal = new(OrderController).onOrderUserUrgeOrder(&innerMsg)
+				retVal = c.onOrderUserUrgeOrder(&innerMsg)
 			}, jxutils.ComposeUniversalOrderID(innerMsg.OrderID, model.VendorIDELM))
 		}
 	} else if msg.Type >= elmapi.MsgTypeWaybillWait4DeliveryVendor && msg.Type <= elmapi.MsgTypeRejectedSystemError {
@@ -56,7 +71,7 @@ func (c *Controller) OnCallbackMsg(msg *elmapi.CallbackMsg) (retVal *elmapi.Call
 			retVal = elmapi.Err2CallbackResponse(err, "")
 		} else {
 			innerMsg.MsgType = msg.Type
-			retVal = new(WaybillController).OnWaybillStatusMsg(&innerMsg)
+			retVal = c.OnWaybillStatusMsg(&innerMsg)
 		}
 	} else {
 		retVal = elmapi.SuccessResponse
--- a/business/partner/purchase/elm/order.go
+++ b/business/partner/purchase/elm/order.go
@@ -34,36 +34,28 @@ var (
 	}
 )

-type OrderController struct {
-	scheduler.BasePurchasePlatform
-}
-
-func init() {
-	scheduler.CurrentScheduler.RegisterPurchasePlatform(model.VendorIDELM, new(OrderController))
-}
-
-func (c *OrderController) OnOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) OnOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onOrderStatusMsg(msg)
 	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }

-func (c *OrderController) OnOrderNewMsg(msg map[string]interface{}) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) OnOrderNewMsg(msg map[string]interface{}) (retVal *elmapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onOrderNew(msg)
 	}, jxutils.ComposeUniversalOrderID(msg["orderId"].(string), model.VendorIDELM))
 	return retVal
 }

-func (c *OrderController) OnOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) OnOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onOrderCancelRefundMsg(msg)
 	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }

-func (c *OrderController) orderStatusMsg2Status(msg *elmapi.CallbackOrderStatusMsg) *model.OrderStatus {
+func (c *PurchaseHandler) orderStatusMsg2Status(msg *elmapi.CallbackOrderStatusMsg) *model.OrderStatus {
 	orderStatus := &model.OrderStatus{
 		VendorOrderID:    msg.OrderID,
 		VendorID:         model.VendorIDELM,
@@ -76,7 +68,7 @@ func (c *OrderController) orderStatusMsg2Status(msg *elmapi.CallbackOrderStatusM
 	return orderStatus
 }

-func (c *OrderController) cancelRefundMsg2Status(msg *elmapi.CallbackOrderCancelRefundMsg) *model.OrderStatus {
+func (c *PurchaseHandler) cancelRefundMsg2Status(msg *elmapi.CallbackOrderCancelRefundMsg) *model.OrderStatus {
 	orderStatus := &model.OrderStatus{
 		VendorOrderID:    msg.OrderID,
 		VendorID:         model.VendorIDELM,
@@ -89,7 +81,7 @@ func (c *OrderController) cancelRefundMsg2Status(msg *elmapi.CallbackOrderCancel
 	return orderStatus
 }

-func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (retVal *elmapi.CallbackResponse) {
 	status := c.orderStatusMsg2Status(msg)
 	switch msg.MsgType {
 	case elmapi.MsgTypeOrderAccepted:
@@ -116,7 +108,7 @@ func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (
 	return elmapi.Err2CallbackResponse(err, status.VendorStatus)
 }

-func (c *OrderController) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancelRefundMsg) (retVal *elmapi.CallbackResponse) {
 	status := c.cancelRefundMsg2Status(msg)
 	switch msg.MsgType {
 	case elmapi.MsgTypeUserApplyCancel:
@@ -129,7 +121,7 @@ func (c *OrderController) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancel
 	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus)
 }

-func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
+func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
 	result, err := api.ElmAPI.GetOrder(orderID)
 	if err == nil {
 		phoneList := result["phoneList"].([]interface{})
@@ -217,7 +209,7 @@ func setOrederDetailFee(result map[string]interface{}, order *model.GoodsOrder)
 }

 //
-func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
 	// todo 这里应该可以直接用msg里的内容，而不用再次去查
 	order, err := c.GetOrder(msg["orderId"].(string))
 	if err == nil {
@@ -230,7 +222,7 @@ func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elma
 	return elmapi.Err2CallbackResponse(err, "elm onOrderNew")
 }

-func (c *OrderController) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg) *elmapi.CallbackResponse {
+func (c *PurchaseHandler) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg) *elmapi.CallbackResponse {
 	status := &model.OrderStatus{
 		VendorOrderID:    msg.OrderID,
 		VendorID:         model.VendorIDELM,
@@ -247,11 +239,11 @@ func (c *OrderController) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg)
 	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnOrderStatusChanged(status), status.VendorStatus)
 }

-func (c *OrderController) stateAndType2Str(state string, msgType int) string {
+func (c *PurchaseHandler) stateAndType2Str(state string, msgType int) string {
 	return fmt.Sprintf("%s-%d", state, msgType)
 }

-func (c *OrderController) spliltCompositeState(compositeState string) (state string, msgType int) {
+func (c *PurchaseHandler) spliltCompositeState(compositeState string) (state string, msgType int) {
 	index := strings.Index(compositeState, "-")
 	if index >= 0 {
 		msgType = int(utils.Str2Int64(compositeState[index+1:]))
@@ -264,7 +256,7 @@ func (c *OrderController) spliltCompositeState(compositeState string) (state str
 }

 // IPurchasePlatformHandler
-func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int {
+func (c *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int {
 	state, _ := c.spliltCompositeState(vendorStatus)
 	if status, ok := VendorStatus2StatusMap[state]; ok {
 		return status
@@ -272,7 +264,7 @@ func (c *OrderController) GetStatusFromVendorStatus(vendorStatus string) int {
 	return model.OrderStatusUnknown
 }

-func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
+func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
 	if isAcceptIt {
 		err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
 	} else {
@@ -283,29 +275,29 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI

 // 饿了么没有拣货这个状态，直接返回成功
 // 真实流程中也不会调用这个方法，因为接收订单后状态会直接转移到已拣货
-func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder) (err error) {
 	return nil
 }

-func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
 	err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
 	return err
 }

 // 饿了么转商家自送后，没有确认送达的概念，空操作
-func (c *OrderController) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder) (err error) {
 	return nil
 }

-func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
 	return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
 }

-func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
 	return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
 }

-func (c *OrderController) GetStatusActionTimeout(statusType, status int) time.Duration {
+func (c *PurchaseHandler) GetStatusActionTimeout(statusType, status int) time.Duration {
 	if statusType == scheduler.TimerStatusTypeOrder && status == model.OrderStatusNew {
 		return acceptOrderDelay // 饿了么开了专送店的订单没有拣货状态，接单后就为拣货完成，所以要延迟接单，否则门店来不及备货
 	}
--- a/business/partner/purchase/elm/order_legacy.go
+++ b/business/partner/purchase/elm/order_legacy.go
@@ -9,7 +9,7 @@ import (
 )

 // 为了兼容之前的表，造出原来需要的数据
-func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err error) {
+func (c *PurchaseHandler) legacyWriteElmOrder(order *model.GoodsOrder) (err error) {
 	db := orm.NewOrm()
 	_, msgType := c.spliltCompositeState(order.VendorStatus)
 	legacyOrder := &legacymodel.Elemeorder2{
@@ -26,7 +26,7 @@ func (c *OrderController) legacyWriteElmOrder(order *model.GoodsOrder) (err erro
 	return err
 }

-func (c *OrderController) legacyElmOrderStatusChanged(status *model.OrderStatus) (err error) {
+func (c *PurchaseHandler) legacyElmOrderStatusChanged(status *model.OrderStatus) (err error) {
 	db := orm.NewOrm()
 	legacyOrder := &legacymodel.Elemeorder2{
 		Orderid: status.VendorOrderID,
--- a/business/partner/purchase/elm/order_test.go
+++ b/business/partner/purchase/elm/order_test.go
@@ -6,7 +6,7 @@ import (
 	_ "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"
+	"git.rosy.net.cn/jx-callback/globals/beegodb"
 	"github.com/astaxie/beego"
 )

@@ -17,13 +17,13 @@ func init() {
 	beego.BConfig.RunMode = "dev" // InitBeegoBeforeTest会将runmode设置为test

 	globals.Init()
-	db.Init()
+	beegodb.Init()
 	api.Init()
 }

 func TestGetOrder(t *testing.T) {
 	orderID := "3025427524410871880"
-	order, err := new(OrderController).GetOrder(orderID)
+	order, err := new(PurchaseHandler).GetOrder(orderID)
 	if err != nil {
 		panic(err.Error())
 	}
--- a/business/partner/purchase/elm/waybill.go
+++ b/business/partner/purchase/elm/waybill.go
@@ -11,17 +11,14 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 )

-type WaybillController struct {
-}
-
-func (c *WaybillController) OnWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) OnWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
 	jxutils.CallMsgHandler(func() {
 		retVal = c.onWaybillStatusMsg(msg)
 	}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDELM))
 	return retVal
 }

-func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
+func (c *PurchaseHandler) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatusMsg) (retVal *elmapi.CallbackResponse) {
 	order := c.callbackMsg2Waybill(msg)
 	if msg.MsgType == elmapi.MsgTypeWaybillWait4Courier { //MsgTypeWaybillWait4Courier事件与JD的新运单事件的时间机制更相似
 		order.Status = model.WaybillStatusNew
@@ -51,7 +48,7 @@ func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatus
 	return elmapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 }

-func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatusMsg) (retVal *model.Waybill) {
+func (c *PurchaseHandler) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatusMsg) (retVal *model.Waybill) {
 	retVal = &model.Waybill{
 		VendorOrderID:   msg.OrderID,
 		OrderVendorID:   model.VendorIDELM,
@@ -65,6 +62,6 @@ func (c *WaybillController) callbackMsg2Waybill(msg *elmapi.CallbackWaybillStatu
 	return retVal
 }

-func (c *WaybillController) composeState(state, subState string, msgType int) string {
+func (c *PurchaseHandler) composeState(state, subState string, msgType int) string {
 	return fmt.Sprintf("%s-%d", state, msgType)
 }