From 25f1ee3cd418285f64a17947c869dc01f1675d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Feb 2025 14:11:13 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/orderman_ext.go | 5 +++-- business/jxstore/cms/store_sku.go | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 08cdb45b7..950cfd1c2 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -493,7 +493,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS minus = v.SkuCount2 } - if minus == 0 { // 退差价的,count还在 + if minus == 0 { // 退差价的,count还在 退重 if afsInfo[v.SkuID].Count == model.NO && v.EarningType == model.EarningTypeQuote { v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice)) v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice)) @@ -508,9 +508,10 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS count += 1 } } - if count == 1 { + if count == 1 { // 同一商品一个sku退一部分 v.SkuCount2 -= minus } else { + // 同一商品多个sku退一部分 ->对应一个afsOrder,分辨不出来是退的哪一个了 if have, _ := afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)]; !have { afsSkuMapObj[v.VendorOrderID+"_"+utils.Int2Str(v.SkuID)+"_"+utils.Time2Str(afsInfo[v.SkuID].CreatedAt)] = true v.SkuCount2 -= minus diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 89955cea3..ba9e16c13 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1740,9 +1740,8 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku } isAsync = asyncStoreSkuOpFilter(ctx, isAsync) num = int64(len(skuIDs)) - globals.SugarLogger.Debugf("--------num:=%d, %s", num, utils.Format4Output(skuIDs, false)) if num > 0 { - hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError) + //hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError) } if num == 0 || !isAsync || hint == "" { hint = utils.Int64ToStr(num)