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

- fix bug about elm order callback msg replay.

Browse Source
This commit is contained in:
gazebo
2018-07-16 11:10:16 +08:00
parent e1e5e93319
commit d3ba00679d
6 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,9 +79,9 @@ func (c *OrderController) onOrderStatusMsg(msg *elmapi.CallbackOrderStatusMsg) (
return elmapi.SuccessResponse
}
err := controller.OrderManager.OnOrderStatusChanged(status)
if globals.HandleLegacyJxOrder && err == nil {
c.legacyElmOrderStatusChanged(status)
}
// if globals.HandleLegacyJxOrder && err == nil {
// c.legacyElmOrderStatusChanged(status)
// }
return elmapi.Err2CallbackResponse(err, status.VendorStatus)
}
@@ -119,8 +119,8 @@ func (c *OrderController) getOrderInfo(orderID string) (order *model.GoodsOrder,
ConsigneeAddress: result["address"].(string),
BuyerComment: utils.Interface2String(result["description"]),
ExpectedDeliveredTime: utils.Str2TimeWithDefault(utils.Interface2String(result["deliverTime"]), utils.DefaultTimeValue),
// 这里已经做了elm VendorStatus的状态组合了
VendorStatus: c.stateAndType2Str(utils.Interface2String(result["status"]), elmapi.MsgTypeOrderValid),
// 取订单的原始status，不合并消息类型（因为当前消息类型没有意义）
VendorStatus: utils.Interface2String(result["status"]),
OrderCreatedAt: utils.Str2Time(result["createdAt"].(string)),
OriginalData: string(utils.MustMarshal(result)),
Skus: []*model.OrderSku{},
@@ -163,11 +163,12 @@ func (c *OrderController) onOrderNew(msg map[string]interface{}) (response *elma
// todo 这里应该可以直接用msg里的内容，而不用再次去查
order, err := c.getOrderInfo(msg["orderId"].(string))
if err == nil {
order.VendorStatus = c.stateAndType2Str(msg["status"].(string), elmapi.MsgTypeOrderValid)
order.Status = model.OrderStatusNew
err = controller.OrderManager.OnOrderNew(order)
if globals.HandleLegacyJxOrder && err == nil {
c.legacyWriteElmOrder(order)
}
// if globals.HandleLegacyJxOrder && err == nil {
// c.legacyWriteElmOrder(order)
// }
}
return elmapi.Err2CallbackResponse(err, "elm onOrderNew")
}