1

business/jxstore/cms/sku.go

@@ -3050,6 +3050,7 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 		db        = dao.GetDB()
 		i         = 0
 		// skuIDs    []int
+		imgList = make([]string, 0, 0)
 	)
 	if fromTime != "" {
 		fromTimeP = utils.Time2Date(utils.Str2Time(fromTime))
@@ -3073,54 +3074,51 @@ 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_2014714835287875592" { // 测试
+						skuEx := &model.SkuExinfoMap{
-							skuEx := &model.SkuExinfoMap{
+							NameID:          storeId,
-								NameID:          storeId,
+							ImgWatermark:    v.PictureList[0], // 原图
-								ImgWatermark:    v.PictureList[0], // 原图
+							ImgWatermarkMix: v.AppFoodCode,    // 商品ID
-								ImgWatermarkMix: v.AppFoodCode,    // 商品ID
+							ExPrefix:        exPrefix,
-								ExPrefix:        exPrefix,
+							VendorID:        vendorID,
-								VendorID:        vendorID,
+							BeginAt:         fromTimeP,
-								BeginAt:         fromTimeP,
+							EndAt:           toTimeP,
-								EndAt:           toTimeP,
+							BrandID:         0,
-								BrandID:         0,
-							}
-							dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
-							dao.CreateEntity(db, skuEx)
-
-							param := map[string]interface{}{}
-							qiNiuImg := ""
-							ImgMix := ""
-							if imgWaterMark != "" {
-								qiNiuImg = jxutils.UploadQiNiuImg(v.PictureList[0])
-								if ImgMix = jxutils.MixWatermarkImg2(imgWaterMark, qiNiuImg, &fromTimeP, &toTimeP); ImgMix != "" {
-									picture := make([]string, 0, len(v.PictureList))
-									picture = append(picture, ImgMix)
-									if len(v.PictureList) > 1 {
-										picture = append(picture, v.PictureList[1:]...)
-									}
-									param["picture"] = strings.Join(picture, ",")
-								}
-							}
-							if exPrefix != "" {
-								param["name"] = fmt.Sprintf("%s %s", exPrefix, v.Name)
-							}
-							globals.SugarLogger.Debugf("------param := %s", utils.Format4Output(param, false))
-							api.RetailInitData(utils.GetUUID(), storeDetail.VendorStoreID, v.AppFoodCode, param)
-							globals.SugarLogger.Debugf("------qiNiuImg := %s", qiNiuImg)
-							globals.SugarLogger.Debugf("------ImgMix := %s", ImgMix)
-							//jxutils.DeleteExportContent(strings.Split(qiNiuImg, "/")[3])
-							//jxutils.DeleteExportContent(strings.Split(ImgMix, "/")[3])
-							return nil, err
 						}
+						dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
+						dao.CreateEntity(db, skuEx)
 
+						param := map[string]interface{}{}
+						qiNiuImg := ""
+						ImgMix := ""
+						if imgWaterMark != "" {
+							qiNiuImg = jxutils.UploadQiNiuImg(v.PictureList[0])
+							if ImgMix = jxutils.MixWatermarkImg2(imgWaterMark, qiNiuImg, &fromTimeP, &toTimeP); ImgMix != "" {
+								picture := make([]string, 0, len(v.PictureList))
+								picture = append(picture, ImgMix)
+								if len(v.PictureList) > 1 {
+									picture = append(picture, v.PictureList[1:]...)
+								}
+								param["picture"] = strings.Join(picture, ",")
+							}
+						}
+						if exPrefix != "" {
+							param["name"] = fmt.Sprintf("%s %s", exPrefix, v.Name)
+						}
+						api.RetailInitData(utils.GetUUID(), storeDetail.VendorStoreID, v.AppFoodCode, param)
+						imgList = append(imgList, qiNiuImg, ImgMix)
+						time.Sleep(100 * time.Microsecond)
 					}
 					if len(foodList) < 100 {
 						break
 					}
 					i++
 				}
-			}
 
+				for _, v := range imgList {
+					jxutils.DeleteExportContent(strings.Split(v, "/")[3])
+					time.Sleep(100 * time.Microsecond)
+				}
+			}
 			return retVal, err
 		}, []int{1})
 	tasksch.HandleTask(task, nil, true).Run()
@@ -3130,6 +3128,7 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
 		_, err = task.GetResult(0)
 		hint = "1"
 	}
+
 	return hint, err
 }