From f96b82165d60dd186cd24a3660d1d9409b611b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 16 Jun 2020 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=89=8D=E7=BC=80=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go              | 13 ++++++++-----
 business/model/sku.go                        | 17 +++++++++++++++++
 business/partner/purchase/mtwm/store_sku2.go |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 4de3ecf4a..822870cf7 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -75,6 +75,8 @@ type StoreSkuSyncInfo struct {
 	ExPrefix      string
 	ExPrefixBegin *time.Time
 	ExPrefixEnd   *time.Time
+	ExVendorID    int `orm:"column(ex_vendor_id)" json:"exVendorID"`
+
 	// NameID       int    `orm:"column(name_id)"`
 	VendorNameID    string `orm:"column(vendor_name_id)"` // 暂时无用
 	Name            string
@@ -90,10 +92,11 @@ type StoreSkuSyncInfo struct {
 	PreparationTime int
 
 	// 平台相关的图片信息
-	Img     string
-	Img2    string
-	Img3    string
-	DescImg string
+	Img          string
+	Img2         string
+	Img3         string
+	DescImg      string
+	ImgWatermark string `json:"imgWatermark"` //图片水印
 
 	VendorVendorCatID int64  `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
 	CategoryName      string `json:"categoryName"`                //分类名
@@ -407,7 +410,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, t1.jds_ware_id,
 	t2.*,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id, t3.yb_name_suffix,
-	t3.jds_stock_switch, t3.preparation_time,
+	t3.jds_stock_switch, t3.preparation_time, t3.img_watermark, t3.ex_vendor_id,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	IF(t15.%s <> '', t15.%s, t3.img3) img3,
diff --git a/business/model/sku.go b/business/model/sku.go
index f80864861..84546c1e5 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -281,3 +281,20 @@ type SkuNameExt struct {
 	PlacesStr    string           `json:"-"`
 	MidUnitPrice int              `json:"midUnitPrice"`
 }
+
+type SkuExinfoMap struct {
+	ModelIDCULD
+
+	ExPrefix     string    `orm:"size(255)" json:"exPrefix"`
+	ImgWatermark string    `orm:"size(512)" json:"imgWatermark"` //图片水印
+	NameID       int       `orm:"column(name_id)" json:"nameID"`
+	VendorID     int       `orm:"column(vendor_id)" json:"vendorID"`
+	BeginAt      time.Time `orm:"type(datetime);index" json:"beginAt"`
+	EndAt        time.Time `orm:"type(datetime);index" json:"endAt"`
+}
+
+func (*SkuExinfoMap) TableIndex() [][]string {
+	return [][]string{
+		[]string{"NameID", "VendorID", "BeginAt", "EndAt"},
+	}
+}
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index d33a2e9dc..e678e0514 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -248,7 +248,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 	for i, storeSku := range storeSkuList {
 		isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
 		foodData := make(map[string]interface{})
-		foodDataList[i] = foodData
+		foodDataList[i] = foodData 
 		foodData[mtwmapi.KeyAppFoodCode] = utils.Int2Str(storeSku.SkuID)
 		skus := []map[string]interface{}{
 			map[string]interface{}{