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

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-04 17:20:46 +08:00
parent 80e789e30e
commit 839b52d1db
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,8 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
} }
}() }()
globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", vendorOrgCode)
globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", utils.Format4Output(orderStatus, false))
// 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下 // 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下
if orderStatus != nil { if orderStatus != nil {
if orderStatus.Status == model.OrderStatusAccepted { if orderStatus.Status == model.OrderStatusAccepted {
@@ -181,9 +183,11 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
} }
} }
} else { } else {
globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false))
loadOrder.Status = model.OrderStatusAccepted loadOrder.Status = model.OrderStatusAccepted
loadOrder.VendorStatus = tao_vegetable.OrderStatusNew loadOrder.VendorStatus = tao_vegetable.OrderStatusNew
c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"}) c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"})
globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false))
} }
} }
} }

3
business/partner/purchase/tao_vegetable/order.go
View File

@@ -334,9 +334,6 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
msg.OrderStatus = tao_vegetable.OrderStatusOnSaleCancel msg.OrderStatus = tao_vegetable.OrderStatusOnSaleCancel
} }
status := c.callbackOrderMsg2Status(msg) status := c.callbackOrderMsg2Status(msg)
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
return nil
}
// 校验重复消息 // 校验重复消息
if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 { if partner.CurOrderManager.GetStatusDuplicatedCount(status) > 0 {
return tao_vegetable.CallBackResultInfo(nil) return tao_vegetable.CallBackResultInfo(nil)