From c7736952b320be5212ea9a677bdf61e91e25566d Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 18 Jul 2019 11:54:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8DGetPricePercentage?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils_cms.go | 4 ++-- business/partner/purchase/ebai/store_sku.go | 4 ++-- business/partner/purchase/mtwm/store_sku.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go index b68029da5..285a0bfa2 100644 --- a/business/jxutils/jxutils_cms.go +++ b/business/jxutils/jxutils_cms.go @@ -248,10 +248,10 @@ func GetPricePercentage(l model.PricePercentagePack, unitPrice int, defPricePerc if len(l) > 0 { var lastItem *model.PricePercentageItem for _, v := range l { - lastItem = v if v.BeginPrice > unitPrice { break } + lastItem = v } if lastItem != nil { pricePercentage = lastItem.PricePercentage @@ -265,10 +265,10 @@ func GetPricePercentageByVendorPrice(l model.PricePercentagePack, vendorPrice in if len(l) > 0 { var lastItem *model.PricePercentageItem for _, v := range l { - lastItem = v if CaculateSkuVendorPrice(v.BeginPrice, v.PricePercentage, 0) > vendorPrice { break } + lastItem = v } if lastItem != nil { pricePercentage = lastItem.PricePercentage diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index c0cd8e499..00163a02e 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -230,8 +230,8 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeSku := batchItemList[0].(*tStoreSkuFullInfo) pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, storeSku.UnitPrice, int(storeDetail.PricePercentage)) - globals.SugarLogger.Debugf("skuID:%d, price:%d, pricePercentage:%d", storeSku.SkuID, storeSku.Price, pricePercentage) - globals.SugarLogger.Debugf(utils.Format4Output(storeDetail.PricePercentagePackObj, false)) + // globals.SugarLogger.Debugf("skuID:%d, price:%d, pricePercentage:%d", storeSku.SkuID, storeSku.Price, pricePercentage) + // globals.SugarLogger.Debugf(utils.Format4Output(storeDetail.PricePercentagePackObj, false)) updateFields := []string{model.FieldEbaiSyncStatus} if storeSku.NameID == 0 || storeSku.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 { if storeSku.EbaiSyncStatus&model.SyncFlagNewMask == 0 && !jxutils.IsEmptyID(storeSku.EbaiID) { diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index da0ba857a..1bacfc1ec 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -307,8 +307,8 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks err = fmt.Errorf("SKUNAME%d:%s没有图片，同步失败", skuItem.NameID, skuItem.Name) } else { pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, int(skuItem.UnitPrice), int(storeDetail.PricePercentage)) - globals.SugarLogger.Debugf("skuID:%d, price:%d, pricePercentage:%d", skuItem.SkuID, skuItem.Price, pricePercentage) - globals.SugarLogger.Debugf(utils.Format4Output(storeDetail.PricePercentagePackObj, false)) + // globals.SugarLogger.Debugf("skuID:%d, price:%d, pricePercentage:%d", skuItem.SkuID, skuItem.Price, pricePercentage) + // globals.SugarLogger.Debugf(utils.Format4Output(storeDetail.PricePercentagePackObj, false)) foodData["name"] = jxutils.ComposeSkuName(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, mtwmapi.MaxSkuNameCharCount) foodData["description"] = skuItem.Comment foodData["price"] = jxutils.IntPrice2Standard(int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), pricePercentage, skuItem.CatPricePercentage)))