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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
gazebo
2019-12-11 22:31:07 +08:00
parent db85de7454 8d93079655
commit 2168cf9731
4 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
controllers/cms_store_sku.go
View File

@@ -499,10 +499,10 @@ func (c *StoreSkuController) RefershStoreSkusMidPrice() {
// @Title 根据Excel刷新京西门店商品价
// @Description 根据Excel刷新京西门店商品价
// @Param token header string true "认证token"
// @Param storeIDs query string true "门店列表"
// @Param isAsync query bool true "是否异步，缺省是同步"
// @Param isContinueWhenError query bool true "单个同步失败是否继续，缺省false"
// @Param token header string true "认证token"
// @Param storeIDs formData string true "门店列表"
// @Param isAsync formData bool true "是否异步，缺省是同步"
// @Param isContinueWhenError formData bool true "单个同步失败是否继续，缺省false"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /RefreshJxPriceByExcel [post]
@@ -510,9 +510,9 @@ func (c *StoreSkuController) RefreshJxPriceByExcel() {
var storeIDList []int
c.callRefreshJxPriceByExcel(func(params *tStoreSkuRefreshJxPriceByExcelParams) (retVal interface{}, errCode string, err error) {
if jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil {
// r := c.Ctx.Request
// files := r.MultipartForm.File["userfiles"]
retVal, err = cms.RefreshJxPriceByExcel(params.Ctx, storeIDList, "files", params.IsAsync, params.IsContinueWhenError)
r := c.Ctx.Request
files := r.MultipartForm.File["userfiles"]
retVal, err = cms.RefreshJxPriceByExcel(params.Ctx, storeIDList, files, params.IsAsync, params.IsContinueWhenError)
}
return retVal, "", err
})