From d285ea1716f469fc2aaba1d379af185153c43707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 28 Jan 2026 17:42:40 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/sku.go | 2 ++ business/jxutils/jxutils.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 4af944bf4..4aaa8d25f 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3089,6 +3089,8 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v param := map[string]interface{}{} if imgWaterMark != "" { + globals.SugarLogger.Debugf("---foodList := %s", utils.Format4Output(v, false)) + if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" { globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix) picture := make([]string, 0, len(v.PictureList)) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index ae56c7067..a5ae03ad5 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -1130,6 +1130,8 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time. //合成水印图1111 func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) { + globals.SugarLogger.Debugf("---imgWatermark := %s", imgWatermark) + globals.SugarLogger.Debugf("---img := %s", img) 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))