williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2022-01-15 11:54:05 +08:00
parent 048d116b05
commit c5fb6023f3
18 changed files with 191 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/api/website/controller/activity.go
View File

@ -33,7 +33,7 @@ type (
)
// Instance 活动信息
func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller.ReturnPages, error) {
func (c *Activity) Instance(title string, page, pageSize int) (*controller.ReturnPages, error) {
mActivityInstance := model.NewActivityInstance()
var count int64
@ -43,10 +43,8 @@ func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller
if title != "" {
where = append(where, model2.NewWhereLike("a.title", title))
}
if mode > 0 {
where = append(where, model2.NewWhere("a.mode", mode))
}
out, err := mActivityInstance.Activity(c.UID, c.SelectIdentity, page, pageSize, &count)
out, err := mActivityInstance.Activity(c.UID, c.SelectIdentity, page, pageSize, &count, where...)
if err != nil {
return nil, err
@ -71,6 +69,8 @@ func (c *Activity) Detail(id uint64) (*ActivityDetail, error) {
if err != nil {
return nil, err
}
mActivityInstance.Image.Image = mActivityInstance.Image.Analysis(config.SettingInfo.Domain)
return &ActivityDetail{
ID: out.GetEncodeID(),
ActivityInstanceDetail: out,
@ -82,7 +82,7 @@ func (c *Activity) Detail(id uint64) (*ActivityDetail, error) {
func (c *Activity) Join(id uint64) error {
mActivityInstance := model.NewActivityInstance()
isExist, err := model2.FirstField(mActivityInstance.ActivityInstance, []string{"id", "mode", "join_deadline"},
isExist, err := model2.FirstField(mActivityInstance.ActivityInstance, []string{"id", "amount", "join_deadline"},
model2.NewWhere("id", id), model2.NewWhere("tenant_id", c.tenantID),
model2.NewWhere("status", model2.ActivityInstanceStatusForShow))