1

business/jxstore/cms/sku.go

@@ -3061,6 +3061,11 @@ func UpdateVendorImg(ctx *jxcontext.Context, i, storeId int, imgWaterMark string
 		return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
 	}
 
+	qiNiuImg := jxutils.UploadQiNiuImg("http://p0.meituan.net/retailsp/056305e10e1887a63d5b756c10bbf48b76633.jpg")
+	if ImgMix := jxutils.MixWatermarkImg2(imgWaterMark, qiNiuImg, &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) {
 			switch vendorID {