From b3fb7884d75a2f85189956634c2952129e51716c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 1 Aug 2024 17:38:52 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order_afs.go | 31 ------------------- business/partner/purchase/ebai/order_afs.go | 24 +------------- .../partner/purchase/ebai/order_afs_ex.go | 3 ++ 3 files changed, 4 insertions(+), 54 deletions(-) diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index e8368ba9c..36c347abd 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -69,31 +69,18 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode }() isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder isDuplicated ***:= %v", err) - } if err != nil || (isDuplicated && orderStatus.VendorID != model.VendorIDJX) { if err == nil { dao.Commit(db, txDB) } return err } - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder Commit ***:= %v", err) - } existAfsOrder, err := c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder ***:= %v", err) - } if err != nil { if !dao.IsNoRowsError(err) { return err } } - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder existAfsOrder ***:= %v", err) - globals.SugarLogger.Debugf("==SaveAfsOrder existAfsOrder existAfsOrder ***:= %s", utils.Format4Output(existAfsOrder, false)) - } if existAfsOrder != nil { if existAfsOrder.Status < model.AfsOrderStatusFinished { // todo 可能导致状态回绕 @@ -111,11 +98,6 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode isAdjust = true } if err = c.SaveAfsOrder(db, afsOrder, isAdjust); err != nil { - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder err ***:= %v", err) - globals.SugarLogger.Debugf("==SaveAfsOrder afsOrder ***:= %s", utils.Format4Output(afsOrder, false)) - globals.SugarLogger.Debugf("==SaveAfsOrder isAdjust ***:= %s", utils.Format4Output(isAdjust, false)) - } return err } } @@ -141,10 +123,6 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD } } }() - if afsOrder.VendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==SaveAfsOrder err ***:= %v", err) - globals.SugarLogger.Debugf("==SaveAfsOrder afsOrder ***:= %s", utils.Format4Output(isDeleteFirst, false)) - } if isDeleteFirst { err = utils.CallFuncLogError(func() error { _, err = dao.DeleteEntity(db, afsOrder, "VendorOrderID", "VendorID") @@ -162,9 +140,6 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD return err }, "SaveAfsOrder delete OrderSkuFinancial, afsOrderID:%s", afsOrder.AfsOrderID) if err != nil { - if afsOrder.VendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==DeleteEntity err ***:= %v", err) - } return err } } @@ -172,13 +147,7 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD deductionsByPm := afsOrder.PmSubsidyMoney + afsOrder.AfsFreightMoney + afsOrder.BoxMoney + afsOrder.TongchengFreightMoney afsOrder.RefundMoneyByCal = afsOrder.SkuUserMoney + afsOrder.FreightUserMoney + deductionsByPm - afsOrder.PmRefundMoney // order.TotalMoney += order.SkuJxMoney // 退款单京西补贴部分先不作计算 - if afsOrder.VendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==CreateEntity CreateEntity err ***:= %v", afsOrder) - } if err = dao.CreateEntity(db, afsOrder); err != nil { - if afsOrder.VendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==CreateEntity err ***:= %v", err) - } return err } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index d8041cebe..452358953 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -73,14 +73,9 @@ func (c *PurchaseHandler) OnAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) { if orderStatus := c.callbackAfsMsg2Status(msg); orderStatus != nil { var err error - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debug("==msg := %s", utils.Format4Output(msg, false)) - globals.SugarLogger.Debug("==orderStatus := %s", utils.Format4Output(orderStatus, false)) - } if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew { var afsOrder *model.AfsOrder if msg.Cmd == ebaiapi.CmdOrderPartRefund { - globals.SugarLogger.Debug("====order.partrefund.push :- %s", utils.Format4Output(msg, false)) afsOrder = c.makeAfsOrderInfoPartRefund(msg, orderStatus) } else if msg.Cmd == ebaiapi.CmdOrderReversePush { afsOrder, err = c.makeAfsOrderInfoReverseRefund(msg, orderStatus) @@ -104,28 +99,15 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia } } else { afsOrder2, _ := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==err := %v", err) - globals.SugarLogger.Debugf("==afsOrder2 := %s", utils.Format4Output(afsOrder2, false)) - } if afsOrder2 == nil && msg.Cmd == ebaiapi.CmdOrderPartRefund { afsOrder := c.makeAfsOrderInfoPartRefund(msg, orderStatus) if afsOrder != nil { err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } } else if afsOrder2 == nil && msg.Cmd == ebaiapi.CmdOrderReversePush { - afsOrder, err := c.makeAfsOrderInfoReverseRefund(msg, orderStatus) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==err ***:= %v", err) - globals.SugarLogger.Debugf("==afsOrder** := %s", utils.Format4Output(afsOrder, false)) - } + afsOrder, _ := c.makeAfsOrderInfoReverseRefund(msg, orderStatus) if afsOrder != nil { err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==err ***:= %v", err) - globals.SugarLogger.Debugf("==OnAfsOrderNew afsOrder ***:= %s", utils.Format4Output(afsOrder, false)) - globals.SugarLogger.Debugf("==OnAfsOrderNew orderStatus ***:= %s", utils.Format4Output(orderStatus, false)) - } } } else { err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus) @@ -170,10 +152,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia } afs, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, model.VendorIDEBAI) - if orderStatus.RefVendorOrderID == "4032000156853892856" { - globals.SugarLogger.Debugf("==err ***:= %v", err) - globals.SugarLogger.Debugf("afs afs afs %s", utils.Format4Output(afs, false)) - } if msg.Cmd == ebaiapi.CmdOrderPartRefund { switch utils.Str2Int(orderStatus.VendorStatus) { case ebaiapi.OrderUserCancelMerchantAgreed, ebaiapi.OrderUserCancelCSAgreed: diff --git a/business/partner/purchase/ebai/order_afs_ex.go b/business/partner/purchase/ebai/order_afs_ex.go index 184caa8dc..0dff2cacf 100644 --- a/business/partner/purchase/ebai/order_afs_ex.go +++ b/business/partner/purchase/ebai/order_afs_ex.go @@ -72,6 +72,9 @@ func (c *PurchaseHandler) makeAfsOrderInfoReverseRefund(msg *ebaiapi.CallbackMsg return nil, err } for _, sku := range refundSkuList { + if sku.SkuName == "配送费" { + continue + } orderSku := &model.OrderSkuFinancial{ Count: sku.RefundQuantity, VendorSkuID: utils.Int64ToStr(sku.PlatformSkuId),