From 6b6d2d6b0664ef7c5aa97222ec93cfea0be50aab 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, 8 Dec 2020 10:44:52 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sku.go            |  7 +++++++
 business/jxstore/cms/sync_store_sku.go | 21 ++++++++++++---------
 business/model/dao/store_sku.go        |  2 +-
 business/model/sku.go                  | 13 +++++++------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 42dba6135..f51f7250a 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2693,6 +2693,13 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
 				EndAt:        toTimeP,
 			}
 			dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
+			if imgWaterMark != "" {
+				if skuNames, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil {
+					if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, skuNames[0].Img, &fromTimeP, &toTimeP); ImgMix != "" {
+						skuEx.ImgWatermarkMix = ImgMix
+					}
+				}
+			}
 			skuExs, _ := dao.GetSkuExinfos(db, []int{nameID}, []int{vendorID}, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
 			if len(skuExs) > 0 {
 				skuEx2 := skuExs[0]
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index cfd84da0c..fe2ba7038 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -300,16 +300,19 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
 				skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
 			}
 			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 utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) == 0 {
-					// if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*skuItem.ExPrefixEnd) <= 0 {
-					// downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
-					skuItem.ImgMix = jxutils.MixWatermarkImg(skuItem.ImgWatermark, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
-				}
-				if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixEnd) > 0 {
-					skuItem.ImgMix = ""
-				}
+			// if skuItem.ImgWatermark != "" && model.IsSyncStatusUpdate(skuItem.SkuSyncStatus) && skuItem.VendorID != model.VendorIDJD {
+			if skuItem.VendorID == model.VendorIDJD {
+				skuItem.ImgMix = ""
 			}
+			// if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) == 0 {
+			// 	// if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*skuItem.ExPrefixEnd) <= 0 {
+			// downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
+			// 	skuItem.ImgMix = jxutils.MixWatermarkImg(skuItem.ImgWatermark, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
+			// }
+			// if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixEnd) > 0 {
+			// 	skuItem.ImgMix = ""
+			// }
+			// }
 		}
 	}
 	return inSkuList
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 86df9df60..3e36587bb 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -447,7 +447,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t4.%s_category_id vendor_vendor_cat_id,
 	t4.name category_name,
 	ts.name store_name,
-	tsu.ex_prefix, tsu.begin_at ex_prefix_begin, tsu.end_at ex_prefix_end, tsu.img_watermark,
+	tsu.ex_prefix, tsu.begin_at ex_prefix_begin, tsu.end_at ex_prefix_end, tsu.img_watermark, tsu.img_watermark_mix img_mix,
 	tsu1.vendor_category_id sku_vendor_map_cat_id`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
diff --git a/business/model/sku.go b/business/model/sku.go
index 508efd581..d0c3ad70a 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -297,12 +297,13 @@ type SkuNameExt struct {
 type SkuExinfoMap struct {
 	ModelIDCULD
 
-	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"`   //设置结束时间
-	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"`   //设置结束时间
+	ExPrefix        string    `orm:"size(255)" json:"exPrefix"`           //额外前缀
+	ImgWatermark    string    `orm:"size(512)" json:"imgWatermark"`       //图片水印
+	ImgWatermarkMix string    `orm:"size(512)" json:"imgWatermark"`       //合成水印图
 }
 
 func (*SkuExinfoMap) TableIndex() [][]string {