From 210cf8aee7172d46d3483243142200ace7ba513e 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:16:29 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 9 +++++++++ business/partner/purchase/ebai/order.go | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index aa8c24ad6..b5e38621b 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -115,12 +115,18 @@ 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) @@ -129,6 +135,7 @@ 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 { @@ -152,6 +159,8 @@ 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 3e6f71996..288fe2db2 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -127,13 +127,8 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode }, taskIDs) task.Run() task.GetResult(0) - globals.SugarLogger.Debugf("=======result1 : %s", utils.Format4Output(result1, false)) - globals.SugarLogger.Debugf("=======err1 : %v", err1) - globals.SugarLogger.Debugf("=======result1 : %s", utils.Format4Output(result1, false)) - globals.SugarLogger.Debugf("=======err2 : %v", err2) if err1 == nil { order = p.Map2Order(result1) - globals.SugarLogger.Debugf("=======order : %s", utils.Format4Output(order, false)) if err2 == nil { order.Skus = p.partRefund2OrderDetailSkuList(utils.Interface2String(result2["order_id"]), result2["reverse_order_list"]) giftSkus, discountMoney := getZengSkus(vendorOrderID, result1)