From ca30a0cd0dd7bcf86a0430a09b2960488f733dd3 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 3 Feb 2020 17:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E8=8F=9C=E5=B8=82=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=90=8D=E4=BB=8E=E4=BA=AC=E8=A5=BF=E8=8F=9C=E5=B8=82?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=A5=BF=E9=B2=9C=E8=BE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/jxutils_cms.go | 8 ++++++--
 business/model/const.go         | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/business/jxutils/jxutils_cms.go b/business/jxutils/jxutils_cms.go
index a7d04b834..110bdd1fe 100644
--- a/business/jxutils/jxutils_cms.go
+++ b/business/jxutils/jxutils_cms.go
@@ -99,10 +99,14 @@ func SplitStoreName(fullName, separator, defaultPrefix string) (prefix, bareName
 
 func ComposeStoreName(bareName string, vendorID int) (fullName string) {
 	bareName = TrimDecorationChar(strings.Trim(bareName, "-"))
+	storeName := globals.StoreName
 	if vendorID == model.VendorIDJD {
-		fullName = globals.StoreName + "-" + bareName
+		fullName = storeName + "-" + bareName
 	} else {
-		fullName = globals.StoreName + "(" + bareName + ")"
+		if globals.IsMainProductEnv() && model.ShopChineseNames[vendorID] != "" {
+			storeName = model.ShopChineseNames[vendorID]
+		}
+		fullName = storeName + "(" + bareName + ")"
 	}
 	return fullName
 }
diff --git a/business/model/const.go b/business/model/const.go
index 60f6d1e4e..42627e5ce 100644
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -24,9 +24,9 @@ var (
 
 	ShopChineseNames = map[int]string{
 		VendorIDJD:   "京西菜市",
-		VendorIDMTWM: "美好菜市",
-		VendorIDELM:  "好菜鲜生",
-		VendorIDEBAI: "好菜鲜生",
+		VendorIDMTWM: "京西菜市",
+		VendorIDELM:  "饿鲜达", //"好菜鲜生",
+		VendorIDEBAI: "饿鲜达", //"好菜鲜生",
 		VendorIDJX:   "京西商城",
 		VendorIDWSC:  "微盟微商城",
 	}