From c0e48d9f6707c26c0c0edb676d346a769cccb6e6 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, 9 Jul 2020 17:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA2=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E9=A2=84=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 19 +++++++++++--------
 controllers/cms_store_sku.go      |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 526fbf7fd..073f2e42b 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4674,16 +4674,19 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku
 	if status == model.StoreAuditStatusOnline {
 		return nil, "", fmt.Errorf("审核标志不正确！")
 	}
-	for _, v := range storeSkuAudits {
-		skuList, _ := dao.GetStoreSkusByNameIDs(db, []int{v.StoreID}, v.NameID)
-		if len(skuList) > 0 {
-			if int64(v.AuditPrice) > skuList[0].UnitPrice*2 {
-				storeSkuAudits2 = append(storeSkuAudits2, v)
+	//证明是预审核
+	if status == 2 {
+		for _, v := range storeSkuAudits {
+			skuList, _ := dao.GetStoreSkusByNameIDs(db, []int{v.StoreID}, v.NameID)
+			if len(skuList) > 0 {
+				if int64(v.AuditPrice) > skuList[0].UnitPrice*2 {
+					storeSkuAudits2 = append(storeSkuAudits2, v)
+				}
 			}
 		}
-	}
-	if len(storeSkuAudits2) > 0 {
-		return storeSkuAudits2, "", err
+		if len(storeSkuAudits2) > 0 {
+			return storeSkuAudits2, "", err
+		}
 	}
 	task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index 29cde0023..51f102cad 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -876,7 +876,7 @@ func (c *StoreSkuController) GetStoreSkuAudit() {
 // @Description 审核商品
 // @Param	token				header			string	true	"认证token"
 // @Param	payload				formData		string	true	"json数据，storeskuaudit对象"
-// @Param	status				formData		int		false	"审核标志，1通过，-1 不通过"
+// @Param	status				formData		int		false	"审核标志，1通过，-1 不通过，2 预审核"
 // @Param	isAsync				formData		bool	false	"是否异步，缺省是同步"
 // @Param	isContinueWhenError	formData		bool	false	"单个同步失败是否继续，缺省false"
 // @Success 200 {object} controllers.CallResult