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")
}

19
business/controller/jd/order.go
View File

@@ -7,7 +7,6 @@ import (
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
@@ -49,9 +48,9 @@ func (c *OrderController) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi
status.Status = model.OrderStatusUnknown
}
err := controller.OrderManager.OnOrderStatusChanged(status)
if globals.HandleLegacyJxOrder && err == nil {
c.legacyJdOrderStatusChanged(status)
}
// if globals.HandleLegacyJxOrder && err == nil {
// c.legacyJdOrderStatusChanged(status)
// }
retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
}
return retVal
@@ -127,9 +126,9 @@ func (c *OrderController) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jda
if err == nil {
order.Status = model.OrderStatusNew
err = controller.OrderManager.OnOrderNew(order)
if err == nil {
c.legacyWriteJdOrder(order, false)
}
// if err == nil {
// c.legacyWriteJdOrder(order, false)
// }
}
return jdapi.Err2CallbackResponse(err, "jd onOrderNew")
}
@@ -139,9 +138,9 @@ func (c *OrderController) onOrderAdjust(msg *jdapi.CallbackOrderMsg) *jdapi.Call
if err == nil {
order.Status = model.OrderStatusAdjust
err = controller.OrderManager.OnOrderAdjust(order)
if globals.HandleLegacyJxOrder && err == nil {
c.legacyWriteJdOrder(order, true)
}
// if globals.HandleLegacyJxOrder && err == nil {
// c.legacyWriteJdOrder(order, true)
// }
}
return jdapi.Err2CallbackResponse(err, "jd onOrderAdjust")
}

2
business/controller/mtps/waybill.go
View File

@@ -34,7 +34,7 @@ func (c *WaybillController) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionM
WaybillVendorID: model.VendorIDMTPS,
CourierName: msg.CourierName,
CourierMobile: msg.CourierPhone,
Status: model.WaybillStatusFailed,
Status: model.WaybillStatusFailed, // todo 这里要再确定一下是否只要收到订单异常消息就视为订单失败
VendorStatus: utils.Int2Str(msg.ExceptionCode),
WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
}

2
business/controller/order.go
View File

@@ -139,7 +139,7 @@ func (c *OrderController) updateOrderSkuOtherInfo(orderSkus []*model.OrderSku, d
for _, v := range lists {
skumapper[v[0].(string)] = v[1].(string)
}
globals.SugarLogger.Debug(skumapper)
// globals.SugarLogger.Debug(skumapper)
for _, v := range orderSkus {
if jxskuid, ok := skumapper[v.VendorSkuID]; ok {
v.JxSkuID = int(utils.Str2Int64(jxskuid))