From 74fcf8d4d39474f23b43a13c7e028ec83bc75279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 21 Apr 2020 15:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E5=93=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index f0151bc3f..87928ea12 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1955,14 +1955,23 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(v.SpecQuality)))) skuName.Skus[0].SpecUnit = model.SpecUnitNames[0] } else { - _, _, _, _, _, specQuality := jxutils.SplitSkuName(v.Name) + _, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(v.Name) if specQuality != 0 { skuName.Skus[0].SpecQuality = specQuality - skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality)))) + if specUnit == model.SpecUnitNames[1] || specUnit == model.SpecUnitNames[2] { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality))) * 1000) + } else { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality)))) + } } else { if getNetUpcInfo.SpecQuality != 0 { + if getNetUpcInfo.SpecUnit == model.SpecUnitNames[1] || getNetUpcInfo.SpecUnit == model.SpecUnitNames[2] || + getNetUpcInfo.SpecUnit == "KG" || getNetUpcInfo.SpecUnit == "l" { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality))) * 1000) + } else { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality)))) + } skuName.Skus[0].SpecQuality = getNetUpcInfo.SpecQuality - skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality)))) } else { retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")} return retVal, err @@ -2031,15 +2040,24 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(v.SpecQuality)))) skuName.Skus[0].SpecUnit = model.SpecUnitNames[0] } else { - _, _, _, _, _, specQuality := jxutils.SplitSkuName(v.Name) + _, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(v.Name) if specQuality != 0 { skuName.Skus[0].SpecQuality = specQuality - skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality)))) + if specUnit == model.SpecUnitNames[1] || specUnit == model.SpecUnitNames[2] { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality))) * 1000) + } else { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(specQuality)))) + } } else { if productInfo.SpecQuality == 0 { if getNetUpcInfo.SpecQuality != 0 { + if getNetUpcInfo.SpecUnit == model.SpecUnitNames[1] || getNetUpcInfo.SpecUnit == model.SpecUnitNames[2] || + getNetUpcInfo.SpecUnit == "KG" || getNetUpcInfo.SpecUnit == "l" { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality))) * 1000) + } else { + skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality)))) + } skuName.Skus[0].SpecQuality = getNetUpcInfo.SpecQuality - skuName.Skus[0].Weight = int(utils.Str2Int64(utils.Float64ToStr(float64(getNetUpcInfo.SpecQuality)))) } else { retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, "未查询到商品重量，请补充商品重量！")} return retVal, err