From e387988cd99bab5ca7dcd56916987f95a7b3a3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 27 Mar 2024 11:40:17 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order_afs.go | 12 --------- business/partner/purchase/ebai/financial.go | 2 +- business/partner/purchase/ebai/order.go | 28 +-------------------- business/partner/purchase/ebai/order_afs.go | 13 ---------- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go index 4d723fc4c..21bb07231 100644 --- a/business/jxcallback/orderman/order_afs.go +++ b/business/jxcallback/orderman/order_afs.go @@ -146,11 +146,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 == "4062150144186637882" { - globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder, false)) - } if err = dao.CreateEntity(db, afsOrder); err != nil { - globals.SugarLogger.Debugf("=====err300 %v", err) return err } @@ -159,22 +155,14 @@ func (c *OrderManager) SaveAfsOrder(db *dao.DaoDB, afsOrder *model.AfsOrder, isD orderSku.RefundMoneyByCal = orderSku.PmSkuSubsidyMoney + utils.Float64TwoInt64(float64(afsOrder.RefundMoneyByCal-afsOrder.PmSkuSubsidyMoney)*float64(orderSku.UserMoney+orderSku.PmSubsidyMoney-orderSku.PmSkuSubsidyMoney)/float64(afsOrder.SkuUserMoney+afsOrder.PmSubsidyMoney-afsOrder.PmSkuSubsidyMoney)) afsOrder.Skus[0].RefundMoneyByCal += orderSku.RefundMoneyByCal - if afsOrder.VendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false)) - } if err = dao.CreateEntity(db, orderSku); err != nil { - globals.SugarLogger.Debugf("=====err300 %v", err) return err } } if len(afsOrder.Skus) > 0 { orderSku := afsOrder.Skus[0] orderSku.RefundMoneyByCal = afsOrder.RefundMoneyByCal - orderSku.RefundMoneyByCal - if afsOrder.VendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====orderSku %s", utils.Format4Output(orderSku, false)) - } if err = dao.CreateEntity(db, orderSku); err != nil { - globals.SugarLogger.Debugf("=====orderSku err300 %v", err) return err } } else { diff --git a/business/partner/purchase/ebai/financial.go b/business/partner/purchase/ebai/financial.go index 189d1bea6..5c0069eb0 100644 --- a/business/partner/purchase/ebai/financial.go +++ b/business/partner/purchase/ebai/financial.go @@ -149,7 +149,7 @@ func (p *PurchaseHandler) AfsOrderDetail2Financial(orderData map[string]interfac VendorOrderID: afsOrder.VendorOrderID, VendorSubOrderID: afsOrder.VendorOrderID2, // ConfirmTime: getTimeFromInterface(xMap["apply_time"]), - VendorSkuID: utils.Int64ToStr(utils.MustInterface2Int64(xMap["platform_sku_id"])), + VendorSkuID: utils.Int2Str(xMap["platform_sku_id"].(int)), SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(xMap["custom_sku_id"]), 0)), Name: utils.Interface2String(xMap["sku_name"]), UserMoney: utils.MustInterface2Int64(xMap["refund_user_amount"]), diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index bb1dd6c71..eb2dff79a 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -120,16 +120,8 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode taskID := batchItemList[0].(int) if taskID == 1 { result1, err1 = api.EbaiAPI.OrderGet(vendorOrderID) - if vendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====result1 %s", utils.Format4Output(result1, false)) - globals.SugarLogger.Debugf("=====err1 %v", err) - } } else if taskID == 2 { result2, err2 = api.EbaiAPI.OrderPartRefundGet(vendorOrderID) - if vendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====result2 %s", utils.Format4Output(result2, false)) - globals.SugarLogger.Debugf("=====err2 %v", err) - } } return nil, nil }, taskIDs) @@ -137,9 +129,6 @@ func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *mode task.GetResult(0) if err1 == nil { order = p.Map2Order(result1) - if vendorOrderID == "4062150144186637882" { - 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) @@ -182,15 +171,8 @@ func getZengSkus(orderID string, orderMan map[string]interface{}) (skus []*model func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDetail2 interface{}) (skuList []*model.OrderSku) { refundDetail := orderDetail2.([]interface{}) refundSkuList := refundDetail[len(refundDetail)-1].(map[string]interface{})["sub_reverse_order_list"].([]interface{}) - if orderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====refundDetail %s", utils.Format4Output(refundDetail, false)) - globals.SugarLogger.Debugf("=====refundSkuList %s", utils.Format4Output(refundSkuList, false)) - } for _, product2 := range refundSkuList { product := product2.(map[string]interface{}) - if orderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====product %s", utils.Format4Output(product, false)) - } if product["virtual_type"] == ebaiapi.OrderVirtualType { skuName := product["sku_name"].(string) _, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName) @@ -200,7 +182,7 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet VendorID: model.VendorIDEBAI, Count: number, SkuID: int(utils.Str2Int64WithDefault(utils.Interface2String(product[ebaiapi.KeyCustomSkuID]), 0)), - VendorSkuID: utils.Interface2String(product["platform_sku_id"]), + VendorSkuID: utils.Int2Str(product["platform_sku_id"].(int)), SkuName: skuName, Weight: int(utils.Interface2Int64WithDefault(product["refund_weight"], 0)) / number, // 退单这里的total_weight有BUG，这里的total_weight还是没有退单时的值 VendorPrice: utils.MustInterface2Int64(product["refund_user_amount"]), @@ -213,9 +195,6 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet skuList = append(skuList, sku) } } - if orderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====skuList %s", utils.Format4Output(skuList, false)) - } return skuList } @@ -563,11 +542,6 @@ func (c *PurchaseHandler) onOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi. if status.Status == model.OrderStatusAdjust { var order *model.GoodsOrder order, err = c.GetOrder4PartRefund(GetOrderIDFromMsg(msg)) - if status.RefVendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====orderStatus %s", utils.Format4Output(status, false)) - globals.SugarLogger.Debugf("=====order %s", utils.Format4Output(order, false)) - globals.SugarLogger.Debugf("=====err %v", err) - } if err == nil { err = partner.CurOrderManager.OnOrderAdjust(order, status) } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index b0619c6a9..d41d24661 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -61,9 +61,6 @@ 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 == "4062150144186637882" { - globals.SugarLogger.Debugf("=====orderStatus %s", utils.Format4Output(orderStatus, false)) - } if orderStatus.Status == model.AfsOrderStatusWait4Approve || orderStatus.Status == model.AfsOrderStatusNew { var afsOrder *model.AfsOrder if msg.Cmd == ebaiapi.CmdOrderPartRefund { @@ -130,10 +127,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia } } else { afsOrder2, err := partner.CurOrderManager.LoadAfsOrder(orderStatus.VendorOrderID, orderStatus.VendorID) - if orderStatus.RefVendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====afsOrder2 %s", utils.Format4Output(afsOrder2, false)) - globals.SugarLogger.Debugf("=====err %v", err) - } if afsOrder2 == nil && err == nil { partRefundData := msg.Data.(*ebaiapi.CBPartRefundInfo) afsOrder := &model.AfsOrder{ @@ -165,14 +158,8 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia afsOrder.PmSubsidyMoney += orderSku.PmSubsidyMoney afsOrder.Skus = append(afsOrder.Skus, orderSku) } - if orderStatus.RefVendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====afsOrder %s", utils.Format4Output(afsOrder, false)) - } if afsOrder != nil { err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) - if orderStatus.RefVendorOrderID == "4062150144186637882" { - globals.SugarLogger.Debugf("=====err2 %v", err) - } } } else { err = partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus)