From 0f69e9b51ed00e45a3a9bb76204b4c8ea61333c6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 3 Sep 2019 08:55:28 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=8B=89=E5=8F=96=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=AD=98=E5=82=A8=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E9=97=A8=E5=BA=97=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go |  5 +++--
 business/model/store.go       | 16 +++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ca396b0c0..a55f935e7 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1436,6 +1436,7 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
 							CloseTime2: store.CloseTime2,
 
 							DeliveryType: store.DeliveryType,
+							StoreName:    store.Name,
 						}}
 					}
 				}
@@ -1481,8 +1482,8 @@ func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.V
 			(v.Status != snapshot.Status || v.DeliveryType != snapshot.DeliveryType) {
 			v.Status = snapshot.Status
 			v.DeliveryType = snapshot.DeliveryType
-			v.LastOperator = model.AdminName
-			if _, err = dao.UpdateEntity(db, v, model.FieldLastOperator, model.FieldUpdatedAt, model.FieldStatus, "DeliveryType"); err != nil {
+			v.StoreName = snapshot.StoreName
+			if _, err = dao.UpdateEntity(db, v, model.FieldStatus, "DeliveryType", "StoreName"); err != nil {
 				return err
 			}
 		}
diff --git a/business/model/store.go b/business/model/store.go
index 8401973e9..dd8e927d2 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -356,7 +356,8 @@ type StoreMap struct {
 	StoreID       int    `orm:"column(store_id)" json:"storeID"`
 	VendorID      int    `orm:"column(vendor_id)" json:"vendorID"`
 	VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"`
-	Status        int    `json:"status"` // 取值同Store.Status
+	Status        int    `json:"status"`                    // 取值同Store.Status
+	StoreName     string `orm:"size(255)" json:"storeName"` // 平台门店的名字
 
 	PricePercentage     int16  `orm:"default(100)" json:"pricePercentage"` // todo 厂商价格相对于本地价格的百分比，这个字段的修改会比较特殊，因为可能需要刷新厂商价格
 	PricePercentagePack string `orm:"size(32)" json:"pricePercentagePack"` //
@@ -404,12 +405,13 @@ type VendorStoreSnapshot struct {
 	VendorStoreID string    `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"`
 	SnapshotAt    time.Time `orm:"type(datetime)" json:"snapshotAt"` // 这个不同于CreatedAt，SnapshotAt是逻辑上的时间，CreatedAt是实际存储的时间
 
-	Status       int   `json:"status"`                        // 取值同Store.Status
-	OpenTime1    int16 `json:"openTime1"`                     // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有
-	CloseTime1   int16 `json:"closeTime1"`                    // 格式同上
-	OpenTime2    int16 `json:"openTime2"`                     // 格式同上
-	CloseTime2   int16 `json:"closeTime2"`                    // 格式同上
-	DeliveryType int8  `orm:"default(0)" json:"deliveryType"` // 配送类型
+	Status       int    `json:"status"`                        // 取值同Store.Status
+	OpenTime1    int16  `json:"openTime1"`                     // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有
+	CloseTime1   int16  `json:"closeTime1"`                    // 格式同上
+	OpenTime2    int16  `json:"openTime2"`                     // 格式同上
+	CloseTime2   int16  `json:"closeTime2"`                    // 格式同上
+	DeliveryType int8   `orm:"default(0)" json:"deliveryType"` // 配送类型
+	StoreName    string `orm:"size(255)" json:"storeName"`     // 平台门店的名字
 }
 
 func (*VendorStoreSnapshot) TableUnique() [][]string {