liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jdshop' into qidongsheng

Browse Source
This commit is contained in:
平凡梦
2020-07-10 09:07:19 +08:00
parent 946810c177 4f207c3098
commit a6fdadebb6
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/cms_store_sku.go
View File

@@ -876,7 +876,7 @@ func (c *StoreSkuController) GetStoreSkuAudit() {
// @Description 审核商品
// @Param token header string true "认证token"
// @Param payload formData string true "json数据，storeskuaudit对象"
// @Param status formData int false "审核标志，1通过，-1 不通过"
// @Param status formData int false "审核标志，1通过，-1 不通过，2 预审核"
// @Param isAsync formData bool false "是否异步，缺省是同步"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false"
// @Success 200 {object} controllers.CallResult
@@ -888,7 +888,11 @@ func (c *StoreSkuController) StoreSkuPriceAudit() {
if err = jxutils.Strings2Objs(params.Payload, &storeSkuAudits); err != nil {
return retVal, "", err
}
retVal, err = cms.StoreSkuPriceAudit(params.Ctx, storeSkuAudits, params.Status, params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
retVal, hint, err := cms.StoreSkuPriceAudit(params.Ctx, storeSkuAudits, params.Status, params.IsAsync, params.IsContinueWhenError)
if hint != "" {
return hint, "", err
} else {
return retVal, "", err
}
})
}