From f8d94c882b4f5a7d9220767b493b6f532f734fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 28 Jan 2026 17:25:38 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sku.go |  4 ++--
 business/jxutils/jxutils.go | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 8b1023b6c..3842cd1bc 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -3061,8 +3061,8 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 		return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
 	}
 	img := `https://image.jxc4.com/176958594000e2b7c111897ee53e13312c2bbdc29b132168.jpg`
-	if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, img, &fromTimeP, &toTimeP); ImgMix != "" {
-		return img, err
+	if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, img, &fromTimeP, &toTimeP); ImgMix != "" {
+		return ImgMix, err
 	}
 
 	task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index d125deed3..c82234309 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -1114,6 +1114,32 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.
 				imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
 			}
 			globals.SugarLogger.Debugf("---imgUrl := %s", imgUrl)
+			if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
+				downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
+				if err == nil {
+					return downloadURL
+				}
+			}
+		}
+		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixEnd) > 0 {
+			return imgMix
+		}
+	}
+	return imgMix
+}
+
+//合成水印图1111
+func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) {
+	if exPrefixBegin != nil && exPrefixEnd != nil {
+		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
+			baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
+			var imgUrl string
+			if strings.Contains(img, "?") {
+				imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0"
+			} else {
+				imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0/ws/1/wst/2"
+			}
+			globals.SugarLogger.Debugf("---imgUrl := %s", imgUrl)
 			if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
 				downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
 				globals.SugarLogger.Debugf("---downloadURL := %s", downloadURL)