- QueryActs中createdAtFrom改为可选参数，但dao.QueryActs中限制actID, createdAtFrom与beginAt至少要指定其中一个条件

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

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"