From 6d5d93e1d7c29a9eb7013e410458e7277fd57586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 1 Jun 2020 16:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 18 ++++++++++++++++--
 business/model/dao/dao_order.go   |  2 --
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index b60b21909..9b88f77eb 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4458,8 +4458,22 @@ func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
 }
 
 func GetStoreSkuAudit(ctx *jxcontext.Context, storeIDs, nameIDs, skuIDs, statuss, types []int, name, remark, keyword string, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd string, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
-	fmt.Println(applyTimeStart, applyTimeEnd, auditTimeStart)
-	pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, types, name, remark, keyword, utils.Str2Time(applyTimeStart), utils.Str2Time(applyTimeEnd), utils.Str2Time(auditTimeStart), utils.Str2Time(auditTimeEnd), pageSize, offset)
+	var (
+		applyTimeStartp, applyTimeEndp, auditTimeStartp, auditTimeEndp time.Time
+	)
+	if applyTimeStart != "" {
+		applyTimeStartp = utils.Str2Time(applyTimeStart)
+	}
+	if applyTimeEnd != "" {
+		applyTimeEndp = utils.Str2Time(applyTimeEnd)
+	}
+	if auditTimeStart != "" {
+		auditTimeStartp = utils.Str2Time(auditTimeStart)
+	}
+	if auditTimeEnd != "" {
+		auditTimeEndp = utils.Str2Time(auditTimeEnd)
+	}
+	pagedInfo, err = dao.GetStoreSkuAudit(dao.GetDB(), storeIDs, nameIDs, skuIDs, statuss, types, name, remark, keyword, applyTimeStartp, applyTimeEndp, auditTimeStartp, auditTimeEndp, pageSize, offset)
 	return pagedInfo, err
 }
 
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 55a9ebeda..fc8994645 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -391,8 +391,6 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
 		sql += " AND t2.status IN (" + GenQuestionMarks(len(statusList)) + ")"
 		sqlParams = append(sqlParams, statusList)
 	}
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	err = GetRows(db, &skuList, sql, sqlParams...)
 	return skuList, err
 }