From e664f6312bb1449386c914a62d91f103be743f33 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 10 Jul 2019 10:24:44 +0800 Subject: [PATCH] =?UTF-8?q?-=20QueryActs=E4=B8=ADcreatedAtFrom=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E9=80=89=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=86?= =?UTF-8?q?dao.QueryActs=E4=B8=AD=E9=99=90=E5=88=B6actID,=20createdAtFrom?= =?UTF-8?q?=E4=B8=8EbeginAt=E8=87=B3=E5=B0=91=E8=A6=81=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/act.go | 3 +++ controllers/act.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 93d2b473b..a4f5444bc 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -138,6 +138,9 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs } func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendorID int, statusList []int, actTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *PagedActListInfo, err error) { + if actID == 0 && utils.IsTimeZero(createdAtFrom) && utils.IsTimeZero(beginAt) { + return nil, fmt.Errorf("actID,createdAtFrom和beginAt中，至少要指定一个条件") + } sql := ` SELECT SQL_CALC_FOUND_ROWS t1.id diff --git a/controllers/act.go b/controllers/act.go index 46d1c9412..2fc9cd364 100644 --- a/controllers/act.go +++ b/controllers/act.go @@ -114,7 +114,7 @@ func (c *ActController) CreateAct() { // @Title 查询活动 // @Description 查询活动 // @Param token header string true "认证token" -// @Param createdAtFrom query string true "创建开始日期" +// @Param createdAtFrom query string false "创建开始日期" // @Param createdAtTo query string false "创建结束日期" // @Param keyword query string false "关键字" // @Param actID query int false "活动id"