From 1bb8760316bfbbf118e5d4e9ae81307a5d282662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 30 Apr 2020 09:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E6=9B=B4=E6=96=B0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/yinbaoapi/store_page.go | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/platformapi/yinbaoapi/store_page.go b/platformapi/yinbaoapi/store_page.go
index ac30c229..4a6f196a 100644
--- a/platformapi/yinbaoapi/store_page.go
+++ b/platformapi/yinbaoapi/store_page.go
@@ -369,9 +369,17 @@ func (a *API) FindProduct(productId string) (findProductResult *FindProductResul
 	return findProductResult, err
 }
 
+type SaveProductParam struct {
+	CategoryUid  string `json:"categoryUid"`
+	CategoryName string `json:"categoryName"`
+}
+
 //更新单个商品信息（称编码和图片）
 //Request URL: https://beta27.pospal.cn/Product/SaveProduct
-func (a *API) SaveProduct(userId, keyword string) (err error) {
+func (a *API) SaveProduct(userId, keyword string, saveProductParam *SaveProductParam) (err error) {
+	var (
+		categoryUid, categoryName string
+	)
 	productId, err := a.LoadProductsByPage(userId, keyword)
 	if err != nil {
 		return err
@@ -380,6 +388,13 @@ func (a *API) SaveProduct(userId, keyword string) (err error) {
 	if err != nil {
 		return err
 	}
+	if saveProductParam != nil {
+		categoryUid = saveProductParam.CategoryUid
+		categoryName = saveProductParam.CategoryName
+	} else {
+		categoryUid = utils.Int64ToStr(findProductResult.CategoryUID)
+		categoryName = findProductResult.Category.Name
+	}
 	params2 := map[string]interface{}{
 		"pluCode": findProductResult.Barcode[3:],
 	}
@@ -389,8 +404,8 @@ func (a *API) SaveProduct(userId, keyword string) (err error) {
 		"userId":                  utils.Int2Str(findProductResult.UserID),
 		"barcode":                 findProductResult.Barcode,
 		"name":                    findProductResult.Name,
-		"categoryUid":             utils.Int64ToStr(findProductResult.CategoryUID),
-		"categoryName":            findProductResult.Category.Name,
+		"categoryUid":             categoryUid,
+		"categoryName":            categoryName,
 		"sellPrice":               utils.Float64ToStr(findProductResult.SellPrice),
 		"buyPrice":                utils.Float64ToStr(findProductResult.BuyPrice),
 		"isCustomerDiscount":      "1",