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:33:10 +08:00
parent f8d94c882b
commit c64eb674c2
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3060,10 +3060,6 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
if toTimeP.Before(fromTimeP) { if toTimeP.Before(fromTimeP) {
return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP) return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
} }
img := `https://image.jxc4.com/176958594000e2b7c111897ee53e13312c2bbdc29b132168.jpg`
if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, img, &fromTimeP, &toTimeP); ImgMix != "" {
return ImgMix, err
}
task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx, task := tasksch.NewParallelTask("刷新商品前缀水印图", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -3077,7 +3073,7 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
for { for {
foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i) foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i)
for _, v := range foodList { for _, v := range foodList {
if v.AppFoodCode == "mtcode_2005129131042222122" { // 测试 if v.AppFoodCode == "mtcode_1945736904897372255" { // 测试
skuEx := &model.SkuExinfoMap{ skuEx := &model.SkuExinfoMap{
NameID: storeId, NameID: storeId,
ImgWatermark: v.PictureList[0], // 原图 ImgWatermark: v.PictureList[0], // 原图
@@ -3090,13 +3086,11 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
} }
dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName()) dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
dao.CreateEntity(db, skuEx) dao.CreateEntity(db, skuEx)
fmt.Println(fmt.Sprintf("v.foodList := %s", v.AppFoodCode))
param := map[string]interface{}{} param := map[string]interface{}{}
globals.SugarLogger.Debugf("---imgWaterMark := %s", imgWaterMark)
if imgWaterMark != "" { if imgWaterMark != "" {
if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" { if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" {
globals.SugarLogger.Debugf("---imgMin := %s", ImgMix) globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix)
picture := make([]string, 0, len(v.PictureList)) picture := make([]string, 0, len(v.PictureList))
picture = append(picture, ImgMix) picture = append(picture, ImgMix)
if len(v.PictureList) > 1 { if len(v.PictureList) > 1 {

4
business/jxutils/jxutils.go
View File

@@ -1135,15 +1135,13 @@ func MixWatermarkImg2(imgWatermark, img string, exPrefixBegin, exPrefixEnd *time
baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark)) baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
var imgUrl string var imgUrl string
if strings.Contains(img, "?") { if strings.Contains(img, "?") {
imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0" imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0/ws/1/wst/2"
} else { } else {
imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/Center/dx/0/dy/0/ws/1/wst/2" 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 { if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)]) downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)])
globals.SugarLogger.Debugf("---downloadURL := %s", downloadURL) globals.SugarLogger.Debugf("---downloadURL := %s", downloadURL)
globals.SugarLogger.Debugf("---err := %v", err)
if err == nil { if err == nil {
return downloadURL return downloadURL
} }