From 7dd8c32cabe9b3819440c383de0f82228bf3b3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 26 Mar 2021 08:58:49 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sku.go       | 24 +++++++++++++++++++-----
 business/jxstore/cms/store_sku.go |  2 --
 business/model/sku.go             |  1 +
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index f7d34f26a..55d5e31ad 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -623,6 +623,9 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
 		t1.preparation_time,
 		t1.best_seller
 		`
+	if isBySku {
+		sql += " ,t2.id sku_id"
+	}
 	if isQueryMidPrice {
 		sqlData += ",t4.mid_unit_price"
 	}
@@ -679,11 +682,22 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
 					}
 				}
 			}
-			var skus []*model.Sku
-			sql := `
-				SELECT * FROM sku WHERE deleted_at = ? AND name_id = ?
-			`
-			sqlParams := []interface{}{utils.DefaultTimeValue, skuName.ID}
+			var (
+				skus      []*model.Sku
+				sqlParams = []interface{}{utils.DefaultTimeValue}
+				sql       string
+			)
+			if !isBySku {
+				sql = `
+					SELECT * FROM sku WHERE deleted_at = ? AND name_id = ?
+				`
+				sqlParams = append(sqlParams, skuName.ID)
+			} else {
+				sql = `
+					SELECT * FROM sku WHERE deleted_at = ? AND id = ?
+				`
+				sqlParams = append(sqlParams, skuName.SkuID)
+			}
 			if err = dao.GetRows(db, &skus, sql, sqlParams); err == nil {
 				var skusVendors []*model.SkuWithVendor
 				for _, v := range skus {
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 7d89e1523..03732817d 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -369,8 +369,6 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
 	pageSize = jxutils.FormalizePageSize(pageSize)
 	offset = jxutils.FormalizePageOffset(offset)
 	sqlParams = append(sqlParams, pageSize, offset)
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	dao.Begin(db)
 	defer dao.Commit(db)
 	if err = dao.GetRows(db, &SkuNames, sql, sqlParams...); err == nil {
diff --git a/business/model/sku.go b/business/model/sku.go
index 620e97231..e728fd348 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -293,6 +293,7 @@ type SkuNameExt struct {
 	PlacesStr    string           `json:"-"`
 	MidUnitPrice int              `json:"midUnitPrice"`
 
+	SkuID          int    `orm:"sku_id" json:"skuID"`
 	JdCategoryID   string `json:"jdCategoryID"`
 	JdsCategoryID  string `json:"jdsCategoryID"`
 	EbaiCategoryID string `json:"ebaiCategoryID"`