From 4dd488c0ec1ab70c8c6bcfa2b68ea548698bf615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sun, 24 Mar 2024 18:39:39 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 9 --------- business/partner/purchase/ebai/order.go | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index b5e38621b..aa8c24ad6 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -115,18 +115,12 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model order.Status = model.OrderStatusAccepted } isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) - if order.VendorOrderID == "4075590068743535177" { - globals.SugarLogger.Debugf("============isDuplicated : %s", utils.Format4Output(isDuplicated, false)) - globals.SugarLogger.Debugf("============err : %v", err) - globals.SugarLogger.Debugf("============order : %s", utils.Format4Output(order, false)) - } if err == nil && !isDuplicated { err = utils.CallFuncLogError(func() error { _, err = db.Db.Raw("DELETE FROM order_sku WHERE vendor_order_id = ? AND vendor_id = ?", order.VendorOrderID, order.VendorID).Exec() return err }, "OnAdjustOrder delete order, orderID:%s", order.VendorOrderID) if err != nil { - globals.SugarLogger.Debugf("============err1 : %v", err) return err } adjustCount := int8(0) @@ -135,7 +129,6 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model VendorID: order.VendorID, } if err = dao.GetEntity(db, previousOrder, model.FieldVendorOrderID, model.FieldVendorID); err != nil && !dao.IsNoRowsError(err) { - globals.SugarLogger.Debugf("============err2 : %v", err) return err } if err == nil { @@ -159,8 +152,6 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model order.TotalShopMoney = order2.TotalShopMoney } isDuplicated, err = c.SaveOrder(order, true, db) - globals.SugarLogger.Debugf("============err3 : %v", err) - globals.SugarLogger.Debugf("============isDuplicated : %v", utils.Format4Output(isDuplicated, false)) } if err == nil { dao.Commit(db, txDB) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 5803f8650..674d45cbd 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -541,11 +541,7 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. if status != nil { if status.Status == model.OrderStatusAdjust { var order *model.GoodsOrder - order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)) - globals.SugarLogger.Debugf("==================msg %s", utils.Format4Output(msg, false)) - globals.SugarLogger.Debugf("==================order %s", utils.Format4Output(order, false)) - globals.SugarLogger.Debugf("==================msg %v", err) - if err == nil { + if order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)); err == nil { err = partner.CurOrderManager.OnOrderAdjust(order, status) } } else {