From 95010115703719f3f066199e1aa74428a93055ce 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, 10 Apr 2020 16:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=A8=E5=BA=97=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index d0902c87d..99384496b 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -303,12 +303,12 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 	sql += `
 	JOIN store_sku_bind t4 ON t4.store_id = t3.id AND t4.sku_id = t2.id AND t4.deleted_at = ?
 	LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code
+	LEFT JOIN price_refer_snapshot t6 ON t6.city_code = ? AND t6.name_id = t1.id AND t6.snapshot_at = ?
 	WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR 1 = ?)/* AND t1.status = ?*/
 	`
-	// LEFT JOIN price_refer_snapshot t6 ON t6.city_code = 0 AND t6.sku_id = t2.id AND t6.snapshot_at = ?
 	sqlParams = append(sqlParams, []interface{}{
 		utils.DefaultTimeValue,
-		// utils.Time2Date(time.Now().AddDate(0, 0, -1)),
+		0, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
 		utils.DefaultTimeValue,
 		utils.Bool2Int(isFocus),
 	})
@@ -520,7 +520,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 		LIMIT ? OFFSET ?`
 		sqlParams = append(sqlParams, sqlParamsPage)
 	}
-	//,t6.mid_unit_price real_mid_unit_price
 	sql = `
 	SELECT SQL_CALC_FOUND_ROWS
 	t3.id store_id, t3.name store_name, t3.pay_percentage,
@@ -533,7 +532,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.yb_sync_status,
 	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price,
 	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time,
-	t4.status_sale_begin, t4.status_sale_end
+	t4.status_sale_begin, t4.status_sale_end,
+	t6.mid_unit_price real_mid_unit_price
 	` + sql
 	if isHighPrice {
 		sql += " , t4.unit_price DESC LIMIT 99"