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-09-10 18:46:04 +08:00
parent f632622b55
commit a6350630bd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/partner/purchase/jx/callback.go
View File

@@ -11,7 +11,6 @@ const (
appKey = "4A86853D-E4B6-454E-940A-B68ECDA2B73E" appKey = "4A86853D-E4B6-454E-940A-B68ECDA2B73E"
MsgTypeOrder = "order" MsgTypeOrder = "order"
SubMsgTypeOrderNew = "newOrder"
) )
type CallbackResponse struct { type CallbackResponse struct {

8
business/partner/purchase/jx/order.go
View File

@@ -29,7 +29,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *CallbackMsg) (retVal, errCode string,
if subMsgType == model.OrderStatusNew || subMsgType == model.OrderStatusAdjust { if subMsgType == model.OrderStatusNew || subMsgType == model.OrderStatusAdjust {
var order *Data4Neworder var order *Data4Neworder
if err = utils.UnmarshalUseNumber([]byte(msg.Data), &order); err == nil { if err = utils.UnmarshalUseNumber([]byte(msg.Data), &order); err == nil {
retVal, errCode, err = c.onOrderNew(msg, order) retVal, errCode, err = c.onOrderNew(msg, subMsgType, order)
} }
} else { } else {
status := c.callbackMsg2Status(msg) status := c.callbackMsg2Status(msg)
@@ -53,15 +53,15 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *CallbackMsg) *model.OrderStatu
return orderStatus return orderStatus
} }
func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, order *Data4Neworder) (retVal, errCode string, err error) { func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, subMsgType int, order *Data4Neworder) (retVal, errCode string, err error) {
globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.ThingID) globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.ThingID)
order.GoodsOrder.Skus = order.Skus order.GoodsOrder.Skus = order.Skus
order.VendorID = model.VendorIDJX order.VendorID = model.VendorIDJX
jxutils.RefreshOrderSkuRelated(&order.GoodsOrder) jxutils.RefreshOrderSkuRelated(&order.GoodsOrder)
orderStatus := model.Order2Status(&order.GoodsOrder) orderStatus := model.Order2Status(&order.GoodsOrder)
if msg.SubMsgType == SubMsgTypeOrderNew { if subMsgType == model.OrderStatusNew {
err = partner.CurOrderManager.OnOrderNew(&order.GoodsOrder, orderStatus) err = partner.CurOrderManager.OnOrderNew(&order.GoodsOrder, orderStatus)
} else { } else if subMsgType == model.OrderStatusAdjust {
err = partner.CurOrderManager.OnOrderAdjust(&order.GoodsOrder, orderStatus) err = partner.CurOrderManager.OnOrderAdjust(&order.GoodsOrder, orderStatus)
} }
return retVal, errCode, err return retVal, errCode, err