From 36b78d0f60859a6aa28ae79b0a95eea4554aae8f 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, 28 May 2020 13:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 6 ++++--
 business/model/dao/store_sku.go   | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index b08ea8622..854300772 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -312,11 +312,12 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 	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.sku_id = t2.id AND t6.snapshot_at = ?
+	LEFT JOIN store_sku_audit t7 ON t7.store_id = t4.store_id AND t7.name_id = t1.id AND t7.status = ?
 	WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR 1 = ?)/* AND t1.status = ?*/
 	`
 	sqlParams = append(sqlParams, []interface{}{
 		utils.DefaultTimeValue,
-		0, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
+		0, model.StoreAuditStatusOnline, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
 		utils.DefaultTimeValue,
 		utils.Bool2Int(isFocus),
 	})
@@ -544,7 +545,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price, t4.jds_price,
 	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time, t4.jds_lock_time,
 	t4.status_sale_begin, t4.status_sale_end,
-	t6.mid_unit_price real_mid_unit_price
+	t6.mid_unit_price real_mid_unit_price,
+	t7.unit_price audit_unit_price
 	` + sql
 	if isHighPrice || priceType != 0 {
 		sql += " , t4.unit_price DESC LIMIT 99"
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 7ad56c0e0..f6f0da5ea 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -155,6 +155,7 @@ type StoreSkuNameExt struct {
 	RealMidUnitPrice int    `json:"realMidUnitPrice"`
 	Count            int    `json:"count"`
 	YbSkuName        string `json:"ybSkuName"`
+	AuditUnitPrice   int    `json:"auditUnitPrice"` //审核价格
 }
 
 // GetStoreSkus用