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

a

Browse Source
This commit is contained in:
苏尹岚
2020-12-29 15:09:20 +08:00
parent e456ee1be9
commit 04acffa985
3 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/jxstore/event/event.go
View File

@@ -375,7 +375,7 @@ func UpdateMessageGroup(ctx *jxcontext.Context, groupID int, payload map[string]
return num, err return num, err
} }
func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (errCode string, err error) { func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string, flag bool) (errCode string, err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
messageGroup = &model.MessageGroup{ messageGroup = &model.MessageGroup{
@@ -385,6 +385,18 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err
if err = dao.GetEntity(db, messageGroup, "GroupID"); err != nil { if err = dao.GetEntity(db, messageGroup, "GroupID"); err != nil {
return errCode, err return errCode, err
} }
//解散群
if flag {
messageGroup.DeletedAt = time.Now()
messageGroup.LastOperator = ctx.GetUserName()
dao.UpdateEntity(db, messageGroup, "DeletedAt", "LastOperator")
messageGroupMembers, _ := dao.GetMessageGroupMembers(db, groupID, 0, "")
for _, v := range messageGroupMembers {
v.DeletedAt = time.Now()
v.LastOperator = ctx.GetUserName()
dao.UpdateEntity(db, v, "DeletedAt", "LastOperator")
}
} else {
//token中用户与传入user不一致就判定为踢人 //token中用户与传入user不一致就判定为踢人
if ctx.GetUserID() != userID { if ctx.GetUserID() != userID {
if messageGroup.UserID != ctx.GetUserID() { if messageGroup.UserID != ctx.GetUserID() {
@@ -432,6 +444,7 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err
} }
dao.Commit(db) dao.Commit(db)
} }
}
return errCode, err return errCode, err
} }

4
business/model/dao/event.go
View File

@@ -267,8 +267,8 @@ func GetMessageGroupMembers(db *DaoDB, groupID, groupType int, memberUserID stri
FROM message_group_member a FROM message_group_member a
` `
if groupType != 0 { if groupType != 0 {
sql += ` JOIN message_group b ON b.group_id = a.group_id AND b.type = ?` sql += ` JOIN message_group b ON b.group_id = a.group_id AND b.type = ? AND b.deleted_at = ?`
sqlParams = append(sqlParams, groupType) sqlParams = append(sqlParams, groupType, utils.DefaultTimeValue)
} }
sql += ` sql += `
WHERE a.deleted_at = ? WHERE a.deleted_at = ?

3
controllers/event_controller.go
View File

@@ -364,12 +364,13 @@ func (c *EventController) UpdateMessageGroup() {
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param groupID formData int true "组号" // @Param groupID formData int true "组号"
// @Param userID formData string true "userID" // @Param userID formData string true "userID"
// @Param flag formData bool false "是否是解散群"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /DeleteMessageGroup [post] // @router /DeleteMessageGroup [post]
func (c *EventController) DeleteMessageGroup() { func (c *EventController) DeleteMessageGroup() {
c.callDeleteMessageGroup(func(params *tEventDeleteMessageGroupParams) (retVal interface{}, errCode string, err error) { c.callDeleteMessageGroup(func(params *tEventDeleteMessageGroupParams) (retVal interface{}, errCode string, err error) {
errCode, err = event.DeleteMessageGroup(params.Ctx, params.GroupID, params.UserID) errCode, err = event.DeleteMessageGroup(params.Ctx, params.GroupID, params.UserID, params.Flag)
return retVal, errCode, err return retVal, errCode, err
}) })
} }