liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2026-01-28 17:42:40 +08:00
parent c64eb674c2
commit d285ea1716
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sku.go
View File

@@ -3089,6 +3089,8 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
param := map[string]interface{}{} param := map[string]interface{}{}
if imgWaterMark != "" { if imgWaterMark != "" {
globals.SugarLogger.Debugf("---foodList := %s", utils.Format4Output(v, false))
if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" { if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" {
globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix) globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix)
picture := make([]string, 0, len(v.PictureList)) picture := make([]string, 0, len(v.PictureList))

2
business/jxutils/jxutils.go
View File

@@ -1130,6 +1130,8 @@ func MixWatermarkImg(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.
//合成水印图1111 //合成水印图1111
func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time.Time) (imgMix string) { 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 exPrefixBegin != nil && exPrefixEnd != nil {
if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 { 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)) baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))