From b88ebaa56ee21bffdc0861976df223acafba5ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 15 Apr 2020 10:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E5=93=81=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=A2=9E=E5=8A=A0=E5=88=86=E7=B1=BBID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 8 ++++----
 controllers/cms_sku.go      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 2814c0b7d..baf4eaae3 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1776,18 +1776,18 @@ func buildCreateUpcSkuByExcelErr(v *model.SkuName, errMsg string) (createUpcSkuB
 	return createUpcSkuByExcelErr
 }
 
-func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader) (hint string, err error) {
+func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader, categoryID int) (hint string, err error) {
 	if len(files) == 0 {
 		return "", errors.New("没有文件上传！")
 	}
 	fileHeader := files[0]
 	file, err := fileHeader.Open()
-	hint, err = CreateUpcSkuByExcelBin(ctx, file)
+	hint, err = CreateUpcSkuByExcelBin(ctx, file, categoryID)
 	file.Close()
 	return hint, err
 }
 
-func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint string, err error) {
+func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID int) (hint string, err error) {
 	var (
 		db                                  = dao.GetDB()
 		skuParams                           []*model.SkuName
@@ -2044,7 +2044,7 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint stri
 				}
 				skuName.Status = model.SkuStatusNormal
 				skuName.IsGlobal = model.YES
-				skuName.CategoryID = model.NoCatCatgoryID
+				skuName.CategoryID = categoryID
 				skuName.Skus[0].Status = model.SkuStatusNormal
 				_, err = AddSkuName(ctx, skuName, ctx.GetUserName())
 				if err != nil {
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 6abf8778c..996dac8ef 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -454,6 +454,7 @@ func (c *SkuController) UpdateExianDaSkuCategory() {
 // @Title 根据Excel创建标品
 // @Description 根据Excel创建标品
 // @Param	token				header		string	true	"认证token"
+// @Param	categroyID			formData	int		true	"分类ID"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /CreateUpcSkuByExcel [post]
@@ -461,7 +462,7 @@ func (c *SkuController) CreateUpcSkuByExcel() {
 	c.callCreateUpcSkuByExcel(func(params *tSkuCreateUpcSkuByExcelParams) (retVal interface{}, errCode string, err error) {
 		r := c.Ctx.Request
 		files := r.MultipartForm.File["userfiles"]
-		retVal, err = cms.CreateUpcSkuByExcel(params.Ctx, files)
+		retVal, err = cms.CreateUpcSkuByExcel(params.Ctx, files, params.CategroyID)
 		return retVal, "", err
 	})
 }