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-12-08 10:01:17 +08:00
parent b3e2f8eb96
commit e4fe9faaad
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -944,6 +944,9 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
if db == nil { if db == nil {
db = dao.GetDB() db = dao.GetDB()
} }
if orderStatus.RefVendorOrderID == "1100842032100912947" {
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(orderStatus, false))
}
isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db)
if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) { if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) {
// todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态 // todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态
@@ -961,6 +964,9 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
// if orderStatus.VendorID == model.VendorIDMTWM && model.IsOrderFinalStatus(order.Status) { // if orderStatus.VendorID == model.VendorIDMTWM && model.IsOrderFinalStatus(order.Status) {
// return false, order, nil // return false, order, nil
// } // }
if orderStatus.RefVendorOrderID == "1100842032100912947" {
globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(order, false))
}
if (model.IsOrderLockStatus(orderStatus.Status) || model.IsOrderUnlockStatus(orderStatus.Status)) || if (model.IsOrderLockStatus(orderStatus.Status) || model.IsOrderUnlockStatus(orderStatus.Status)) ||
(model.IsOrderMainStatus(orderStatus.Status) && orderStatus.Status >= order.Status) { // todo 要求status不能回绕 (model.IsOrderMainStatus(orderStatus.Status) && orderStatus.Status >= order.Status) { // todo 要求status不能回绕
order.VendorStatus = orderStatus.VendorStatus order.VendorStatus = orderStatus.VendorStatus
@@ -994,6 +1000,9 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag") updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag")
} }
} }
if orderStatus.RefVendorOrderID == "1100842032100912947" {
globals.SugarLogger.Debugf("======================:2 %s", utils.Format4Output(order, false))
}
utils.CallFuncLogError(func() error { utils.CallFuncLogError(func() error {
_, err = db.Db.Update(order, updateFields...) _, err = db.Db.Update(order, updateFields...)
return err return err