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

根据excel创建标品改为异步

Browse Source
This commit is contained in:
苏尹岚
2020-04-09 16:52:15 +08:00
parent 8ef12e0f88
commit d08ce8bfa0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxstore/cms/sku.go
View File

@@ -1740,18 +1740,18 @@ func buildCreateUpcSkuByExcelErr(v *model.SkuName, errMsg string) (createUpcSkuB
return createUpcSkuByExcelErr return createUpcSkuByExcelErr
} }
func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader) (err error) { func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader) (hint string, err error) {
if len(files) == 0 { if len(files) == 0 {
return errors.New("没有文件上传！") return "", errors.New("没有文件上传！")
} }
fileHeader := files[0] fileHeader := files[0]
file, err := fileHeader.Open() file, err := fileHeader.Open()
err = CreateUpcSkuByExcelBin(ctx, file) hint, err = CreateUpcSkuByExcelBin(ctx, file)
file.Close() file.Close()
return err return hint, err
} }
func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error) { func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint string, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
skuParams []*model.SkuName skuParams []*model.SkuName
@@ -1955,8 +1955,8 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error
} }
taskSeq := tasksch.NewSeqTask2("根据excel创建标品-序列任务", ctx, true, taskSeqFunc, 3) taskSeq := tasksch.NewSeqTask2("根据excel创建标品-序列任务", ctx, true, taskSeqFunc, 3)
tasksch.HandleTask(taskSeq, nil, true).Run() tasksch.HandleTask(taskSeq, nil, true).Run()
_, err = taskSeq.GetResult(0) hint = taskSeq.GetID()
return err return hint, err
} }
func writeToExcel(excelTitle []string, dataList interface{}, task *tasksch.SeqTask) (err error) { func writeToExcel(excelTitle []string, dataList interface{}, task *tasksch.SeqTask) (err error) {

2
controllers/cms_sku.go
View File

@@ -460,7 +460,7 @@ func (c *SkuController) CreateUpcSkuByExcel() {
c.callCreateUpcSkuByExcel(func(params *tSkuCreateUpcSkuByExcelParams) (retVal interface{}, errCode string, err error) { c.callCreateUpcSkuByExcel(func(params *tSkuCreateUpcSkuByExcelParams) (retVal interface{}, errCode string, err error) {
r := c.Ctx.Request r := c.Ctx.Request
files := r.MultipartForm.File["userfiles"] files := r.MultipartForm.File["userfiles"]
err = cms.CreateUpcSkuByExcel(params.Ctx, files) retVal, err = cms.CreateUpcSkuByExcel(params.Ctx, files)
return retVal, "", err return retVal, "", err
}) })
} }