1

business/jxstore/cms/sku.go

@@ -3060,10 +3060,6 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 	if toTimeP.Before(fromTimeP) {
 		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,
 		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 {
 					foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i)
 					for _, v := range foodList {
-						if v.AppFoodCode == "mtcode_2005129131042222122" { // 测试
+						if v.AppFoodCode == "mtcode_1945736904897372255" { // 测试
 							skuEx := &model.SkuExinfoMap{
 								NameID:          storeId,
 								ImgWatermark:    v.PictureList[0], // 原图
@@ -3090,13 +3086,11 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 							}
 							dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
 							dao.CreateEntity(db, skuEx)
-							fmt.Println(fmt.Sprintf("v.foodList := %s", v.AppFoodCode))
 
 							param := map[string]interface{}{}
-							globals.SugarLogger.Debugf("---imgWaterMark := %s", imgWaterMark)
 							if imgWaterMark != "" {
-								if ImgMix := jxutils.MixWatermarkImg(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" {
-									globals.SugarLogger.Debugf("---imgMin := %s", ImgMix)
+								if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, v.PictureList[0], &fromTimeP, &toTimeP); ImgMix != "" {
+									globals.SugarLogger.Debugf("---ImgMix := %s", ImgMix)
 									picture := make([]string, 0, len(v.PictureList))
 									picture = append(picture, ImgMix)
 									if len(v.PictureList) > 1 {