From f6bad9abc6763a62166b64c51192511c0625accd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 8 Dec 2023 10:19:41 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 3c90bcc57..c5d66269f 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -189,6 +189,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } } + if orderStatus.RefVendorOrderID == "1100842032100912947" { + globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(orderStatus, false)) + } isDuplicated, order, err := c.addOrderStatus(orderStatus, db) if err == nil { dao.Commit(db, txDB) @@ -944,9 +947,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da if db == nil { db = dao.GetDB() } - if orderStatus.RefVendorOrderID == "1100842032100912947" { - globals.SugarLogger.Debugf("======================: %s", utils.Format4Output(orderStatus, false)) - } + isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) if err == nil && !isDuplicated && (orderStatus.Status != model.OrderStatusUnknown && orderStatus.Status != model.OrderStatusMsg) { // todo 加这个代码的原因是,抖店运单取消会去将本地的订单状态设置为取消,跳过,不修改本地订单状态 @@ -964,9 +965,6 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da // if orderStatus.VendorID == model.VendorIDMTWM && model.IsOrderFinalStatus(order.Status) { // 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)) || (model.IsOrderMainStatus(orderStatus.Status) && orderStatus.Status >= order.Status) { // todo 要求status不能回绕 order.VendorStatus = orderStatus.VendorStatus @@ -1000,9 +998,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da updateFields = append(updateFields, "LockStatus", "LockStatusTime", "Flag") } } - if orderStatus.RefVendorOrderID == "1100842032100912947" { - globals.SugarLogger.Debugf("======================:2 %s", utils.Format4Output(order, false)) - } + utils.CallFuncLogError(func() error { _, err = db.Db.Update(order, updateFields...) return err @@ -1019,9 +1015,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da } } } - if orderStatus.RefVendorOrderID == "1100842032100912947" { - globals.SugarLogger.Debugf("======================:3 %s", utils.Format4Output(order, false)) - } + return isDuplicated, order, err }