diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index c052caff3..0e6c06068 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -277,15 +277,6 @@ func getSkuBoxFee(vendorID int) (boxFee int64) { return boxFee } -func formalizeStoreSkuListForJds(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyncInfo { - if len(inSkuList) > 0 { - for _, skuItem := range inSkuList { - skuItem.SkuName = jxutils.ComposeSkuNameSync2(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd) - } - } - return inSkuList -} - func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyncInfo { if len(inSkuList) > 0 { boxFee := getSkuBoxFee(inSkuList[0].VendorID) @@ -298,7 +289,11 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn skuItem.VendorVendorCatID = utils.Str2Int64(skuItem.SkuVendorMapCatID) } skuItem.MergedStatus = jxutils.MergeSkuStatus(jxutils.MergeSkuStatus(skuItem.NameStatus, skuItem.Status), skuItem.StoreSkuStatus) - skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd) + if skuItem.VendorID == model.VendorIDMTWM { + skuItem.SkuName = jxutils.ComposeSkuNameSync2(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd) + } else { + skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd) + } skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0) if skuItem.ImgWatermark != "" && model.IsSyncStatusUpdate(skuItem.SkuSyncStatus) && skuItem.VendorID != model.VendorIDJD { // if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) == 0 { diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 2fe3d5aa0..3d53d930b 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -396,7 +396,7 @@ func ComposeSkuNameOriginal(prefix, name, comment, unit string, spec_quality flo return skuName } -func ComposeSkuNameForJds(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int) (skuName string) { +func ComposeSkuNameForMTWM(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int) (skuName string) { strBuilder := &strings.Builder{} if prefix != "" { strBuilder.WriteString("[") @@ -405,15 +405,15 @@ func ComposeSkuNameForJds(prefix, name, comment, unit string, spec_quality float } skuName += name strBuilder.WriteString(name) - if comment != "" { - strBuilder.WriteString(" ") - strBuilder.WriteString(comment) - } - if unit == "份" { - strBuilder.WriteString("约") - } if unit != "" { strBuilder.WriteString(ComposeSkuSpec(spec_quality, spec_unit)) + strBuilder.WriteString("/") + strBuilder.WriteString(unit) + } + if comment != "" { + strBuilder.WriteString("(") + strBuilder.WriteString(comment) + strBuilder.WriteString(")") } skuName = strBuilder.String() if maxLen > 0 { @@ -454,7 +454,7 @@ func ComposeSkuNameSync2(prefix, name, comment, unit string, spec_quality float3 skuName = "" } } - skuName += ComposeSkuNameForJds(prefix, name, comment, unit, spec_quality, spec_unit, maxLen) + skuName += ComposeSkuNameForMTWM(prefix, name, comment, unit, spec_quality, spec_unit, maxLen) return skuName }