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:
邹宗楠
2024-07-30 14:31:22 +08:00
parent 77da7d26a2
commit d6e1893671
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,9 +176,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
panic(r)
}
}()
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======orderStatus := %s", utils.Format4Output(orderStatus, false))
}
// 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下
if orderStatus != nil && orderStatus.Status == model.OrderStatusAccepted {
loadOrder, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID)
@@ -196,10 +193,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
}
isDuplicated, order, err := c.addOrderStatus(orderStatus, db)
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======isDuplicated2 := %s", utils.Format4Output(isDuplicated, false))
globals.SugarLogger.Debugf("=======order := %s", utils.Format4Output(order, false))
}
if err == nil {
dao.Commit(db, txDB)
if orderStatus.Status == model.OrderStatusWaybillTipChanged {
@@ -976,11 +969,6 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
}
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======order2 := %s", utils.Format4Output(orderStatus, false))
globals.SugarLogger.Debugf("=======isDuplicated := %s", utils.Format4Output(isDuplicated, false))
globals.SugarLogger.Debugf("=======err := %v", err)
}
if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
// todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态
if orderStatus.RefVendorID == model.VendorIDDD && orderStatus.OrderType == model.OrderTypeWaybill && orderStatus.VendorStatus == utils.Int64ToStr(tiktok_api.ShipmentStatusCanceled) {
@@ -1032,10 +1020,6 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
}
utils.CallFuncLogError(func() error {
if orderStatus.VendorOrderID == "3901182973700720079" {
globals.SugarLogger.Debugf("=======order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=======updateFields := %s", utils.Format4Output(updateFields, false))
}
_, err = db.Db.Update(order, updateFields...)
return err
}, "addOrderStatus update orderID:%s, status:%v", order.VendorOrderID, orderStatus)