From e178ddc87ad22d26f0e379177a5e6843546f7660 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 26 Apr 2021 18:20:45 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jdshop/store.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 834d27c72..e0ffcc916 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -50,8 +50,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	}
 	timeJSON, _ := json.Marshal(timeMap)
 	updateEntityStoreParam := &jdshopapi.UpdateEntityStoreParam{
-		StoreID:     utils.Str2Int(store.VendorStoreID),
-		Name:        store.Name,
+		StoreID: utils.Str2Int(store.VendorStoreID),
+		//Name:        store.Name,
 		AddCode:     store.JdsCode,
 		AddCodeName: store.DistrictName,
 		AddName:     store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address,
@@ -67,7 +67,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if updateEntityStoreParam.AddCode == 0 {
 		updateEntityStoreParam.AddCode = store.JdCode
 	}
-	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	url, _ := getAPI("2").UploadImageNew(data, "2659335b16e3880e367759b8fc675933.tem.png")
 	ex := store.LicenceExpire
 	if ex == "" {
@@ -102,9 +101,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if len(storeName) > 30 {
 		storeName = utils.LimitUTF8StringLen2(storeName, 30)
 	}
+	if storeName != store.Name {
+		updateEntityStoreParam.Name = storeName
+	}
+	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	if err == nil {
 		param := &jdshopapi.UpdateBasicParam{
-			//StoreName:          storeName,
+			StoreName:          storeName,
 			CategoryID2:        4,
 			Coordinate:         utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
 			BussinessBeginTime: int2TimeStr(int(store.OpenTime1)),
@@ -264,6 +267,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 	if len(storeName) > 30 {
 		storeName = utils.LimitUTF8StringLen2(storeName, 30)
 	}
+	if storeName != store.Name {
+		createEntityStoreParam.Name = storeName
+	}
 	param := &jdshopapi.UpdateBasicParam{
 		StoreName:          storeName,
 		CategoryID2:        4,