1
This commit is contained in:
@@ -3043,12 +3043,11 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
|
||||
return hint, err
|
||||
}
|
||||
|
||||
func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, vendorID int, exPrefix string, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||
func UpdateVendorImg(ctx *jxcontext.Context, i, storeId int, imgWaterMark string, vendorID int, exPrefix string, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||
var (
|
||||
fromTimeP time.Time
|
||||
toTimeP time.Time
|
||||
db = dao.GetDB()
|
||||
i = 0
|
||||
// skuIDs []int
|
||||
imgList = make([]string, 0, 0)
|
||||
)
|
||||
@@ -3071,49 +3070,49 @@ func UpdateVendorImg(ctx *jxcontext.Context, storeId int, imgWaterMark string, v
|
||||
return nil, err
|
||||
}
|
||||
api := mtwm.GetAPI(storeDetail.VendorOrgCode, storeId, storeDetail.VendorStoreID)
|
||||
for {
|
||||
foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i)
|
||||
for _, v := range foodList {
|
||||
skuEx := &model.SkuExinfoMap{
|
||||
NameID: storeId,
|
||||
ImgWatermark: v.PictureList[0], // 原图
|
||||
ImgWatermarkMix: v.AppFoodCode, // 商品ID
|
||||
ExPrefix: exPrefix,
|
||||
VendorID: vendorID,
|
||||
BeginAt: fromTimeP,
|
||||
EndAt: toTimeP,
|
||||
BrandID: 0,
|
||||
}
|
||||
dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
|
||||
dao.CreateEntity(db, skuEx)
|
||||
//for {
|
||||
foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i)
|
||||
for _, v := range foodList {
|
||||
skuEx := &model.SkuExinfoMap{
|
||||
NameID: storeId,
|
||||
ImgWatermark: v.PictureList[0], // 原图
|
||||
ImgWatermarkMix: v.AppFoodCode, // 商品ID
|
||||
ExPrefix: exPrefix,
|
||||
VendorID: vendorID,
|
||||
BeginAt: fromTimeP,
|
||||
EndAt: toTimeP,
|
||||
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, ",")
|
||||
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)
|
||||
}
|
||||
globals.SugarLogger.Debugf("----i := %d,len := %d", i, len(foodList))
|
||||
if len(foodList) < 100 {
|
||||
break
|
||||
if exPrefix != "" {
|
||||
param["name"] = fmt.Sprintf("%s %s", exPrefix, v.Name)
|
||||
}
|
||||
i++
|
||||
api.RetailInitData(utils.GetUUID(), storeDetail.VendorStoreID, v.AppFoodCode, param)
|
||||
imgList = append(imgList, qiNiuImg, ImgMix)
|
||||
time.Sleep(100 * time.Microsecond)
|
||||
}
|
||||
// globals.SugarLogger.Debugf("----i := %d,len := %d", i, len(foodList))
|
||||
// if len(foodList) < 100 {
|
||||
// break
|
||||
// }
|
||||
// i++
|
||||
//}
|
||||
|
||||
for _, v := range imgList {
|
||||
jxutils.DeleteExportContent(strings.Split(v, "/")[3])
|
||||
|
||||
@@ -623,6 +623,7 @@ func (c *SkuController) UpdateSkuExinfoMap() {
|
||||
// @Param imgWaterMark formData string false "商品水印图"
|
||||
// @Param vendorID formData int true "平台ID"
|
||||
// @Param storeId formData int true "京西门店ID"
|
||||
// @Param offset formData int true "跳过页数"
|
||||
// @Param isAsync formData bool false "是否异步"
|
||||
// @Param isContinueWhenError formData bool false "单个同步失败是否继续,缺省false"
|
||||
// @Success 200 {object} controllers.CallResult
|
||||
@@ -630,7 +631,7 @@ func (c *SkuController) UpdateSkuExinfoMap() {
|
||||
// @router /UpdateVendorSkuImg [put]
|
||||
func (c *SkuController) UpdateVendorSkuImg() {
|
||||
c.callUpdateVendorSkuImg(func(params *tSkuUpdateVendorSkuImgParams) (retVal interface{}, errCode string, err error) {
|
||||
retVal, err = cms.UpdateVendorImg(params.Ctx, params.StoreId, params.ImgWaterMark, params.VendorID, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError)
|
||||
retVal, err = cms.UpdateVendorImg(params.Ctx, params.Offset, params.StoreId, params.ImgWaterMark, params.VendorID, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError)
|
||||
return retVal, "", err
|
||||
})
|
||||
}
|
||||
|
||||
123833
swagger/param_parser.go.txt
123833
swagger/param_parser.go.txt
File diff suppressed because it is too large
Load Diff
@@ -15318,7 +15318,7 @@
|
||||
}
|
||||
},
|
||||
"/sku/DeleteVendorSkuImg": {
|
||||
"put": {
|
||||
"post": {
|
||||
"tags": [
|
||||
"sku"
|
||||
],
|
||||
@@ -15336,6 +15336,7 @@
|
||||
"in": "formData",
|
||||
"name": "name",
|
||||
"description": "文件名称",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
@@ -17293,6 +17294,14 @@
|
||||
"type": "integer",
|
||||
"format": "int64"
|
||||
},
|
||||
{
|
||||
"in": "formData",
|
||||
"name": "offset",
|
||||
"description": "跳过页数",
|
||||
"required": true,
|
||||
"type": "integer",
|
||||
"format": "int64"
|
||||
},
|
||||
{
|
||||
"in": "formData",
|
||||
"name": "isAsync",
|
||||
|
||||
@@ -10387,7 +10387,7 @@ paths:
|
||||
"200":
|
||||
description: '{object} controllers.CallResult'
|
||||
/sku/DeleteVendorSkuImg:
|
||||
put:
|
||||
post:
|
||||
tags:
|
||||
- sku
|
||||
description: 删除已经存在文件
|
||||
@@ -10401,6 +10401,7 @@ paths:
|
||||
- in: formData
|
||||
name: name
|
||||
description: 文件名称
|
||||
required: true
|
||||
type: string
|
||||
responses:
|
||||
"200":
|
||||
@@ -11735,6 +11736,12 @@ paths:
|
||||
required: true
|
||||
type: integer
|
||||
format: int64
|
||||
- in: formData
|
||||
name: offset
|
||||
description: 跳过页数
|
||||
required: true
|
||||
type: integer
|
||||
format: int64
|
||||
- in: formData
|
||||
name: isAsync
|
||||
description: 是否异步
|
||||
|
||||
Reference in New Issue
Block a user