From 964f13e2f1157baaa3e1c3cadcab65777bd1b333 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, 25 Mar 2021 17:30:24 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store_sku.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index f38497c9a..6aecb62ee 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -281,11 +281,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b sql := ` SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, e.id store_id FROM sku_name a - JOIN sku b ON b.name_id = a.id AND b.status = ? AND b.deleted_at = ? + JOIN sku b ON b.name_id = a.id AND b.deleted_at = ? JOIN store e ON e.deleted_at = ? AND e.id = ? ` sqlParams = append(sqlParams, - model.SkuStatusNormal, utils.DefaultTimeValue, + utils.DefaultTimeValue, utils.DefaultTimeValue, storeID, ) if !isFocus { @@ -341,12 +341,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b } sql += ` WHERE a.deleted_at = ? - AND a.status = ? AND (a.is_global = 1 OR f.id IS NOT NULL) AND ((a.status = 1 AND b.status = 1) OR c.status = 1) ` sqlParams = append(sqlParams, - utils.DefaultTimeValue, model.SkuStatusNormal, + utils.DefaultTimeValue, ) if !isFocus { sql += " AND c.sku_id IS NULL"