liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gazebo
2019-07-10 10:24:44 +08:00
parent 88d965962a
commit e664f6312b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/dao/act.go
View File

@@ -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) { 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 := ` sql := `
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS
t1.id t1.id

2
controllers/act.go
View File

@@ -114,7 +114,7 @@ func (c *ActController) CreateAct() {
// @Title 查询活动 // @Title 查询活动
// @Description 查询活动 // @Description 查询活动
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param createdAtFrom query string true "创建开始日期" // @Param createdAtFrom query string false "创建开始日期"
// @Param createdAtTo query string false "创建结束日期" // @Param createdAtTo query string false "创建结束日期"
// @Param keyword query string false "关键字" // @Param keyword query string false "关键字"
// @Param actID query int false "活动id" // @Param actID query int false "活动id"