From fa28f3b30c252d70f46c21b4e9d3290474dea8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 18 Feb 2020 10:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E9=B2=9C=E8=BE=BE=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=92=8C=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go                  | 31 +++++++++++++-------
 business/jxstore/cms/store_sku.go            |  4 +--
 business/model/dao/sku.go                    |  3 +-
 business/partner/purchase/ebai/store_sku2.go |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 59b7f55f9..d975ee376 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -427,6 +427,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 		} else {
 			sql += " AND t2.exd_sku_id = ''"
 		}
+	} else {
+		sql += " AND t2.exd_sku_id = ''"
 	}
 	if params["categoryID"] != nil {
 		cat := &model.SkuCategory{}
@@ -1521,22 +1523,29 @@ func CopyEbaiSkuPriceToJx(ctx *jxcontext.Context) (err error) {
 	db := dao.GetDB()
 	skuList, err := api.EbaiAPI.PageGetSkuList(32267350915)
 	for _, v := range skuList {
-		price := int(utils.Float64TwoInt64(v["sale_price"].(float64) * 100))
-		var skuNameList []*model.SkuName
+		sku, _ := api.EbaiAPI.PageGetSku(32267350915, utils.Str2Int64(v["sku_id"].(string)))
+		var skuName model.SkuName
+		sql2 := `
+			SELECT * FROM sku_category WHERE exd_name like ?
+		`
+		sqlParams2 := []interface{}{
+			"%" + sku.CustomCatName + "%",
+		}
+		dao.GetRow(db, &skuName, sql2, sqlParams2)
+		price := int(utils.Float64TwoInt64(utils.Interface2Float64WithDefault(v["sale_price"], 0) * 100))
 		sql := `
-			SELECT * 
-			FROM sku_name
-			WHERE upc = ?
-			 AND exd_sku_id <> ''
+			UPDATE sku_name a
+			JOIN sku b ON a.id = b.name_id
+			SET a.price = ?,a.category_id = ?
+			WHERE a.upc = ?
+			 AND b.exd_sku_id = ?
 		`
 		sqlParams := []interface{}{
+			price, skuName.ID,
 			v["upc"].(string),
+			v["sku_id"].(string),
 		}
-		err = dao.GetRows(db, &skuNameList, sql, sqlParams...)
-		for _, vv := range skuNameList {
-			vv.Price = price
-			dao.UpdateEntity(db, vv, "Price")
-		}
+		dao.ExecuteSQL(db, sql, sqlParams)
 	}
 	return err
 }
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 41c5c1bb3..06e30d233 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1041,8 +1041,8 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 						// globals.SugarLogger.Debug(utils.Format4Output(inSkuBind, false))
 						var skuBind *model.StoreSkuBind
 						if v.ID == 0 {
-							if v.ExdSkuID == "" {
-								// if !(strings.Contains(v.StoreName, model.ExdStoreName) && v.ExdSkuID == "") {
+							// if v.ExdSkuID == "" {
+							if (strings.Contains(v.StoreName, model.ExdStoreName) && v.ExdSkuID != "") || (!strings.Contains(v.StoreName, model.ExdStoreName) && v.ExdSkuID == "") {
 								if skuBindInfo.IsFocus == 1 && v.SkuNameStatus == model.SkuStatusNormal && v.SkuStatus == model.SkuStatusNormal && isCanChangePrice {
 									skuBind = &model.StoreSkuBind{
 										StoreID:    storeID,
diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index 35c2bf9a5..c9a970c72 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -70,7 +70,8 @@ func GetCategories(db *DaoDB, parentID, level int, catIDs []int, isExd bool) (ca
 	if isExd {
 		sql += " ORDER BY t1.level, t1.exd_seq"
 	} else {
-		sql += " ORDER BY t1.level, t1.seq"
+		sql += ` AND t1.is_exd_spec = 0
+				 ORDER BY t1.level, t1.seq`
 	}
 	return cats, GetRows(db, &cats, sql, params)
 }
diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go
index 29ad99a2a..f944995ac 100644
--- a/business/partner/purchase/ebai/store_sku2.go
+++ b/business/partner/purchase/ebai/store_sku2.go
@@ -84,7 +84,7 @@ func getCheckExdStoreNameAndSeq(storeID int, storeCat *dao.SkuStoreCatInfo) (nam
 		if categoryCheck[storeCat.ID] != "" {
 			return storeCat.ExdName, storeCat.ExdSeq, true
 		} else {
-			return storeCat.Name, storeCat.Seq, false
+			return storeCat.ExdName, storeCat.ExdSeq, false
 		}
 	} else {
 		return storeCat.Name, storeCat.Seq, false