From b2e9f913735d12b0a0c326041855ebf16fa60c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 20 Dec 2019 14:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils.go | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index b6f18e31c..1ee21e3ef 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -327,14 +327,9 @@ func FloatWeight2Int(weight float32) int {
 	return int(math.Round(float64(weight * 1000)))
 }
 
-func ComposeSkuName(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int, exPrefix string, exPrefixBegin, exPrefixEnd *time.Time) (skuName string) {
-	if exPrefix != "" && exPrefixBegin != nil && exPrefixEnd != nil {
-		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
-			skuName = exPrefix
-		}
-	}
+func ComposeSkuNameOriginal(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int) (skuName string) {
 	if prefix != "" {
-		skuName += "[" + prefix + "]"
+		skuName = "[" + prefix + "]"
 	}
 	skuName += name
 	if unit == "份" {
@@ -353,6 +348,16 @@ func ComposeSkuName(prefix, name, comment, unit string, spec_quality float32, sp
 	return skuName
 }
 
+func ComposeSkuName(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int, exPrefix string, exPrefixBegin, exPrefixEnd *time.Time) (skuName string) {
+	if exPrefix != "" && exPrefixBegin != nil && exPrefixEnd != nil {
+		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
+			skuName = exPrefix
+		}
+	}
+	skuName += ComposeSkuNameOriginal(prefix, name, comment, unit, spec_quality, spec_unit, maxLen)
+	return skuName
+}
+
 func ComposeSkuNameSync(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int, exPrefix string, exPrefixBegin, exPrefixEnd *time.Time) (skuName string) {
 	if exPrefix != "" && exPrefixBegin != nil && exPrefixEnd != nil {
 		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) < 0 {
@@ -362,23 +367,7 @@ func ComposeSkuNameSync(prefix, name, comment, unit string, spec_quality float32
 			skuName = ""
 		}
 	}
-	if prefix != "" {
-		skuName += "[" + prefix + "]"
-	}
-	skuName += name
-	if unit == "份" {
-		skuName += "约"
-	}
-	if unit != "" {
-		skuName += ComposeSkuSpec(spec_quality, spec_unit)
-		skuName += "/" + unit
-	}
-	if comment != "" {
-		skuName += "(" + comment + ")"
-	}
-	if maxLen > 0 {
-		skuName = utils.LimitUTF8StringLen(skuName, maxLen)
-	}
+	skuName += ComposeSkuNameOriginal(prefix, name, comment, unit, spec_quality, spec_unit, maxLen)
 	return skuName
 }