liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- all call CallFuncLogError add order info

Browse Source 
- callLegacyMsgHandler, callNewMsgHandler and generateLegacyJxOrder config
- call legacy lefted msg handler in new process(elm urge order and bad comment on jd)
This commit is contained in:
gazebo
2018-07-22 13:45:16 +08:00
parent dcdf432ac9
commit 0cb34fe089
14 changed files with 213 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
business/controller/elm/order.go
View File

@@ -15,6 +15,7 @@ import (
"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/legacy/freshfood"
)
const (
@@ -117,7 +118,7 @@ func (c *OrderController) onOrderCancelRefundMsg(msg *elmapi.CallbackOrderCancel
return elmapi.Err2CallbackResponse(controller.OrderManager.OnOrderStatusChanged(status), status.VendorStatus)
}
func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder, err error) {
func (c *OrderController) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
result, err := api.ElmAPI.GetOrder(orderID)
if err == nil {
phoneList := result["phoneList"].([]interface{})
@@ -180,7 +181,7 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
//
func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elmapi.CallbackResponse) {
// todo 这里应该可以直接用msg里的内容，而不用再次去查
order, err := c.getOrderInfo(msg["orderId"].(string))
order, err := c.GetOrder(msg["orderId"].(string))
if err == nil {
order.VendorStatus = c.stateAndType2Str(msg["status"].(string), elmapi.MsgTypeOrderValid)
order.Status = model.OrderStatusNew
@@ -203,6 +204,9 @@ func (c *OrderController) onOrderUserUrgeOrder(msg *elmapi.CallbackOrderUrgeMsg)
VendorStatus: utils.Int2Str(msg.MsgType),
StatusTime: utils.Timestamp2Time(msg.UpdateTime),
}
if globals.ReallyCallPlatformAPI {
freshfood.FreshFoodAPI.ELMClientUrgeOrder(msg.OrderID)
}
return elmapi.Err2CallbackResponse(controller.OrderManager.OnOrderStatusChanged(status), status.VendorStatus)
}
@@ -224,9 +228,6 @@ func (c *OrderController) spliltCompositeState(compositeState string) (state str
// PurchasePlatformHandler
func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) {
globals.SugarLogger.Infof("AcceptOrRefuseOrder order:%v", order)
return nil
if isAcceptIt {
err = api.ElmAPI.ConfirmOrder(order.VendorOrderID)
} else {
@@ -238,30 +239,18 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// 饿了么没有拣货这个状态，直接返回成功
// 真实流程中也不会调用这个方法，因为接收订单后状态会直接转移到已拣货
func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("PickedUpGoods order:%v", order)
return nil
return nil
}
func (c *OrderController) Swtich2SelfDeliver(vendorOrderID string) (err error) {
globals.SugarLogger.Infof("Swtich2SelfDeliver order:%v", vendorOrderID)
return nil
return api.ElmAPI.DeliveryBySelfLite(vendorOrderID)
func (c *OrderController) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) {
return api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
}
func (c *OrderController) SelfDeliverDelievering(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievering order:%v", order)
return nil
return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
}
func (c *OrderController) SelfDeliverDelievered(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievered order:%v", order)
return nil
return api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
}