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-13 17:48:41 +08:00
parent 4637a5fb4b
commit 27cb063a6c
11 changed files with 85 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/website/api/activity.go
View File

@ -18,7 +18,7 @@ func (*Activity) Instance(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := controller.NewActivity()(nil, "").Instance(form.Title, form.Mode, form.Page, form.PageSize)
data, err := controller.NewActivity()(getSession(c)).Instance(form.Title, form.Mode, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -30,7 +30,7 @@ func (*Activity) Detail(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := controller.NewActivity()(nil, "").Detail(form.Convert())
data, err := controller.NewActivity()(getSession(c)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
@ -42,6 +42,6 @@ func (*Activity) Join(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
err := controller.NewActivity()(nil, "").Join(form.Convert())
err := controller.NewActivity()(getSession(c)).Join(form.Convert())
api.APIResponse(err)(c)
}

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

@ -12,10 +12,9 @@ import (
type Activity struct {
*session.Enterprise
local string
}
type ActivityHandle func(session *session.Enterprise, local string) *Activity
type ActivityHandle func(session *session.Enterprise) *Activity
type (
// ActivityInfo 活动信息
@ -38,11 +37,6 @@ func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller
var count int64
var identityUID uint64
if c.Enterprise != nil {
identityUID = c.IdentityUID
}
where := make([]*model2.ModelWhere, 0)
if title != "" {
@ -51,7 +45,7 @@ func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller
if mode > 0 {
where = append(where, model2.NewWhere("a.mode", mode))
}
out, err := mActivityInstance.Activity(identityUID, page, pageSize, &count)
out, err := mActivityInstance.Activity(c.UID, c.SelectIdentity, page, pageSize, &count)
if err != nil {
return nil, err
@ -61,9 +55,7 @@ func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller
for _, v := range out {
list = append(list, &ActivityInfo{
ID: v.GetEncodeID(),
ActivityInstanceInfo: v,
JoinStatus: v.JoinID > 0,
ID: v.GetEncodeID(), ActivityInstanceInfo: v, JoinStatus: v.JoinID > 0,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
@ -73,12 +65,7 @@ func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller
func (c *Activity) Detail(id uint64) (*ActivityDetail, error) {
mActivityInstance := model.NewActivityInstance()
var identityUID uint64
if c.Enterprise != nil {
identityUID = c.IdentityUID
}
out, err := mActivityInstance.Detail(id, identityUID)
out, err := mActivityInstance.Detail(id, c.UID, c.SelectIdentity)
if err != nil {
return nil, err
@ -107,10 +94,14 @@ func (c *Activity) Join(id uint64) error {
if !mActivityInstance.IsCanJoin() {
return errors.New("操作错误，当前活动信息不可报名")
}
if c.SelectIdentity <= 0 {
return errors.New("操作错误，当前未选择任何身份信息")
}
// 查看当前活动是否报名
var count int64
if err = model2.Count(model.NewActivityJoin().ActivityJoin, &count, model2.NewWhere("identity_id", c.IdentityUID),
if err = model2.Count(model.NewActivityJoin().ActivityJoin, &count, model2.NewWhere("id", c.UID),
model2.NewWhere("identity", c.SelectIdentity),
model2.NewWhere("activity_id", id), model2.NewWhere("status", model2.ActivityJoinStatusForSuccess)); err != nil {
return err
}
@ -118,16 +109,13 @@ func (c *Activity) Join(id uint64) error {
return errors.New("操作错误，不可重复报名")
}
if mActivityInstance.Amount <= 0 {
service.Publish(config.EventForActivityJoinProduce, c.IdentityUID, c.UID)
service.Publish(config.EventForActivityJoinProduce, id, c.UID, c.SelectIdentity)
}
return nil
}
func NewActivity() ActivityHandle {
return func(session *session.Enterprise, local string) *Activity {
return &Activity{
Enterprise: session,
local: local,
}
return func(session *session.Enterprise) *Activity {
return &Activity{session}
}
}

12
app/api/website/model/activity_instance.go
View File

@ -29,14 +29,14 @@ type (
)
// Activity 活动信息
func (m *ActivityInstance) Activity(uid uint64, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityInstanceInfo, error) {
func (m *ActivityInstance) Activity(uid uint64, identity, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityInstanceInfo, error) {
mActivityJoin := model.NewActivityJoin()
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.title", "a.image", "a.begin_at", "a.finish_at", "a.join_deadline",
"IFNULL(u.id, 0) AS join_id", "j.count AS join_count").
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.identity_uid = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.uid = %d AND u.identity = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, identity, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT activity_id, COUNT(id) AS count FROM %s WHERE status = %d AND is_deleted = %d GROUP BY activity_id) AS j ON a.id = j.activity_id",
mActivityJoin.TableName(), model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Where("a.status = ?", model.ActivityInstanceStatusForShow).
@ -59,14 +59,14 @@ func (m *ActivityInstance) Activity(uid uint64, page, pageSize int, count *int64
}
// Detail 详细信息
func (m *ActivityInstance) Detail(id, uid uint64) (*ActivityInstanceDetail, error) {
func (m *ActivityInstance) Detail(id, uid uint64, identity int) (*ActivityInstanceDetail, error) {
mActivityJoin := model.NewActivityJoin()
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.title", "a.image", "a.begin_at", "a.finish_at", "a.join_deadline",
"IFNULL(u.id, 0) AS join_id", "j.count AS join_count").
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.identity_uid = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.uid = %d AND u.identity = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, identity, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT activity_id, COUNT(id) AS count FROM %s WHERE status = %d AND is_deleted = %d GROUP BY activity_id) AS j ON a.id = j.activity_id",
mActivityJoin.TableName(), model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Where("a.id = ?", id)