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

- up

Browse Source
This commit is contained in:
gazebo
2019-06-05 22:45:10 +08:00
parent 73991974cc
commit 7c4b23b7de
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/partner/purchase/jd/order.go
View File

@@ -53,9 +53,9 @@ func (c *PurchaseHandler) onOrderMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi
} else { } else {
// 新订单事件，与订单状态有点冲突 // 新订单事件，与订单状态有点冲突
if jdapi.StatusIDNewOrder == msg.StatusID { if jdapi.StatusIDNewOrder == msg.StatusID {
retVal = c.onOrderNew(msg) retVal = c.onOrderNew(msg, status)
} else if jdapi.OrderStatusAdjust == msg.StatusID { } else if jdapi.OrderStatusAdjust == msg.StatusID {
retVal = c.onOrderAdjust(msg) retVal = c.onOrderAdjust(msg, status)
} else { } else {
if msg.StatusID == jdapi.OrderStatusAddComment || msg.StatusID == jdapi.OrderStatusModifyComment { if msg.StatusID == jdapi.OrderStatusAddComment || msg.StatusID == jdapi.OrderStatusModifyComment {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
@@ -173,12 +173,12 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
} }
// //
func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg, orderStatus *model.OrderStatus) (response *jdapi.CallbackResponse) {
globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.BillID) globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.BillID)
order, orderMap, err := c.getOrder(msg.BillID) order, orderMap, err := c.getOrder(msg.BillID)
if err == nil { if err == nil {
globals.SugarLogger.Debugf("onOrderNew2 orderID:%s", msg.BillID) globals.SugarLogger.Debugf("onOrderNew2 orderID:%s", msg.BillID)
if err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)); err == nil { if err = partner.CurOrderManager.OnOrderNew(order, orderStatus); err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap, partner.CreatedPeration) c.OnOrderDetail(orderMap, partner.CreatedPeration)
}) })
@@ -187,10 +187,10 @@ func (c *PurchaseHandler) onOrderNew(msg *jdapi.CallbackOrderMsg) (response *jda
return jdapi.Err2CallbackResponse(err, "jd onOrderNew") return jdapi.Err2CallbackResponse(err, "jd onOrderNew")
} }
func (c *PurchaseHandler) onOrderAdjust(msg *jdapi.CallbackOrderMsg) *jdapi.CallbackResponse { func (c *PurchaseHandler) onOrderAdjust(msg *jdapi.CallbackOrderMsg, orderStatus *model.OrderStatus) *jdapi.CallbackResponse {
order, orderMap, err := c.getOrder(msg.BillID) order, orderMap, err := c.getOrder(msg.BillID)
if err == nil { if err == nil {
err = partner.CurOrderManager.OnOrderAdjust(order, c.callbackMsg2Status(msg)) err = partner.CurOrderManager.OnOrderAdjust(order, orderStatus)
if err == nil { if err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap, partner.UpdatedPeration) c.OnOrderDetail(orderMap, partner.UpdatedPeration)

2
controllers/jd_callback.go
View File

@@ -30,7 +30,7 @@ func (c *DjswController) orderStatus(isCancelOrder bool) {
} else { } else {
obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx)) obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx))
} }
globals.SugarLogger.Debug(utils.Format4Output(obj, false)) globals.SugarLogger.Debug(utils.Format4Output(obj, true))
if callbackResponse == nil { if callbackResponse == nil {
callbackResponse = jd.OnOrderMsg(obj) callbackResponse = jd.OnOrderMsg(obj)
} }