From b11d35cc47a34b312a252f8e09a34e4b1e40c785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sun, 26 Apr 2020 11:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=8F=9C=E5=B8=82=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=88=B0=E6=9E=9C=E5=9B=AD,=E6=9B=B4=E6=96=B0list?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 34 ++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index fb4d2a9df..51d4ff9d8 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4351,7 +4351,6 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 						sql := `
 							SELECT t1.*
 							FROM jxd_dev_0.sku_name t1
-							LEFT JOIN jxd_dev_0.sku t2 ON t2.name_id = t1.id 
 							WHERE t1.deleted_at = ?
 							AND t1.id = ?
 						`
@@ -4407,8 +4406,14 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 							return retVal, err
 						}
 						dao.Commit(db)
-						sql = "SELECT * FROM jxd_dev_0.store_sku_bind WHERE store_id = ? AND sku_id = ? "
-						sqlParams2 := []interface{}{model.MatterStoreID, v.ID}
+						sql = `
+							SELECT * 
+							FROM jxd_dev_0.store_sku_bind a, jxd_dev_0.sku b 
+							WHERE a.sku_id = b.id
+							AND a.store_id = ? 
+							AND b.eclp_id = ? 
+						`
+						sqlParams2 := []interface{}{model.MatterStoreID, v.EclpID}
 						err = dao.GetRows(db, &storeSkus, sql, sqlParams2)
 						if err != nil {
 							return retVal, err
@@ -4431,8 +4436,16 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 						var (
 							storeSkus []*model.StoreSkuBind
 							skuName   *model.SkuName
+							skuNames  []*model.SkuName
 						)
-						skuNames, _ := dao.GetSkuNames(db, []int{v.NameID}, nil, "", false)
+						sql := `
+							SELECT t1.*
+							FROM jxd_dev_0.sku_name t1
+							WHERE t1.deleted_at = ?
+							AND t1.id = ?
+						`
+						sqlParams := []interface{}{utils.DefaultTimeValue, v.NameID}
+						err = dao.GetRows(db, &skuNames, sql, sqlParams)
 						if len(skuNames) > 0 {
 							skuName = skuNames[0]
 						}
@@ -4457,9 +4470,15 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 								return retVal, err
 							}
 						}
-						sql := "SELECT * FROM jxd_dev_0.store_sku_bind WHERE store_id = ? AND sku_id = ? "
-						sqlParams := []interface{}{model.MatterStoreID, v.ID}
-						err = dao.GetRows(db, &storeSkus, sql, sqlParams)
+						sql = `
+							SELECT * 
+							FROM jxd_dev_0.store_sku_bind a, jxd_dev_0.sku b 
+							WHERE a.sku_id = b.id
+							AND a.store_id = ? 
+							AND b.eclp_id = ? 
+						`
+						sqlParams2 := []interface{}{model.MatterStoreID, v.EclpID}
+						err = dao.GetRows(db, &storeSkus, sql, sqlParams2)
 						if err != nil {
 							return retVal, err
 						}
@@ -4468,6 +4487,7 @@ func SyncMatterC4ToGy(ctx *jxcontext.Context, isContinueWhenError, isAsync bool)
 							var skuBindInfos []*StoreSkuBindInfo
 							skuBindInfo := &StoreSkuBindInfo{
 								NameID:    skuName.ID,
+								IsFocus:   1,
 								UnitPrice: storeSkus[0].UnitPrice,
 							}
 							skuBindInfos = append(skuBindInfos, skuBindInfo)