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

- 添加订单跟踪信息

Browse Source
This commit is contained in:
gazebo
2019-05-27 11:02:28 +08:00
parent bdb457e998
commit 7feb45a68d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order.go
View File

@@ -52,6 +52,7 @@ func (c *OrderManager) LoadPendingOrders() []*model.GoodsOrder {
// msgVendorStatus的意思是事件本身的类型，类似有时收到NewOrder事件去取，订单状态不一定就是New的 // msgVendorStatus的意思是事件本身的类型，类似有时收到NewOrder事件去取，订单状态不一定就是New的
// OnOrderAdjust也类似，而OrderStatus要记录的是消息，所以添加这个 // OnOrderAdjust也类似，而OrderStatus要记录的是消息，所以添加这个
func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, orderStatus *model.OrderStatus) (err error) { func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, orderStatus *model.OrderStatus) (err error) {
globals.SugarLogger.Debugf("OnOrderNew orderID:%s", order.VendorOrderID)
if order.ConsigneeMobile2 == "" && !jxutils.IsMobileFake(order.ConsigneeMobile) { if order.ConsigneeMobile2 == "" && !jxutils.IsMobileFake(order.ConsigneeMobile) {
order.ConsigneeMobile2 = order.ConsigneeMobile order.ConsigneeMobile2 = order.ConsigneeMobile
} }
@@ -59,6 +60,7 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, orderStatus *model.Or
db := dao.GetDB() db := dao.GetDB()
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {
globals.SugarLogger.Debugf("OnOrderNew exit orderID:%s", order.VendorOrderID)
if r := recover(); r != nil { if r := recover(); r != nil {
dao.Rollback(db) dao.Rollback(db)
panic(r) panic(r)

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

@@ -167,8 +167,10 @@ 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) (response *jdapi.CallbackResponse) {
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)
if err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)); err == nil { if err = partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)); err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
c.OnOrderDetail(orderMap, partner.CreatedPeration) c.OnOrderDetail(orderMap, partner.CreatedPeration)