From dcb5377bd5f676f00f0c42f188da72c394549c75 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 25 Jun 2021 15:04:14 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync_store_sku.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index b034fe92a..d673244ba 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -3,6 +3,7 @@ package cms
 import (
 	"errors"
 	"fmt"
+	"github.com/astaxie/beego/server/web"
 	"regexp"
 	"sort"
 	"strings"
@@ -303,6 +304,10 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
 			} 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.BrandID == skuItem.ExBrandID && skuItem.ExBrandID != 0) || skuItem.ExBrandID == 0)
 			}
+			//水果美团标品用原名字
+			if skuItem.VendorID == model.VendorIDMTWM && web.BConfig.RunMode == "jxgy" && skuItem.Unit != model.UnitNames[0] {
+				skuItem.SkuName = skuItem.Name
+			}
 			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 skuItem.VendorID == model.VendorIDJD {