diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index c95d439eb..b0547184f 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -500,6 +500,16 @@ func AuditJob(ctx *jxcontext.Context, jobOrderID, status int, comment string) (e return } if status == model.JobOrderStatusAuditPass { + //若完成任务的人在某个群组中,则要向群主分成 + // if messageGroupMembers, err := dao.GetMessageGroupMembers(db, 0, model.GroupTypeMulit, jobOrder.UserID); err == nil { + // if len(messageGroupMembers) > 1 { + // return fmt.Errorf("审核异常,该任务提交人加入了多个群组!") + // } else if len(messageGroupMembers) == 1 { + // if messageGroupsResult, err := dao.GetMessageGroups(db, "", messageGroupMembers[0].GroupID, model.GroupTypeMulit, false, ""); err == nil { + + // } + // } + // } //接收人账户收入 userBillJobOrder, err := dao.GetUserBill(db, jobOrder.UserID, "") if err = financial.AddIncomeUpdateAccount(db, userBillJobOrder, model.BillTypeJob, job.AvgPrice); err != nil { diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go index 5c8090355..0126f0fc1 100644 --- a/business/jxstore/event/event.go +++ b/business/jxstore/event/event.go @@ -209,7 +209,7 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR db = dao.GetDB() ) messageGroups, err := dao.GetMessageGroups(db, userID, 0, 0, true, "") - messageGroupMembers, err := dao.GetMessageGroupMembers(db, 0, userID) + messageGroupMembers, err := dao.GetMessageGroupMembers(db, 0, 0, userID) for _, v := range messageGroupMembers { if messageGroupList, err := dao.GetMessageGroups(db, "", v.GroupID, 0, false, ""); err == nil { messageGroups = append(messageGroups, messageGroupList...) @@ -254,7 +254,7 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er var ( db = dao.GetDB() ) - messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, userID) + messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID) if err != nil { return err } @@ -312,7 +312,7 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err //token中用户与传入user不一致就判定为踢人 if ctx.GetUserID() != userID { if messageGroup.UserID != ctx.GetUserID() { - messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, ctx.GetUserID()) + messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, ctx.GetUserID()) if err != nil { return errCode, err } @@ -320,7 +320,7 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err return errCode, fmt.Errorf("只有创建者和管理员才能踢人!") } } - messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, userID) + messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID) if err != nil { return errCode, err } diff --git a/business/model/dao/event.go b/business/model/dao/event.go index f96ed2a76..6ecb8411a 100644 --- a/business/model/dao/event.go +++ b/business/model/dao/event.go @@ -239,19 +239,26 @@ func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember return messageGroupsResult, err } -func GetMessageGroupMembers(db *DaoDB, groupID int, memberUserID string) (messageGroupMembers []*model.MessageGroupMember, err error) { +func GetMessageGroupMembers(db *DaoDB, groupID, groupType int, memberUserID string) (messageGroupMembers []*model.MessageGroupMember, err error) { + sqlParams := []interface{}{} sql := ` - SELECT * - FROM message_group_member - WHERE deleted_at = ? + SELECT a.* + FROM message_group_member a ` - sqlParams := []interface{}{utils.DefaultTimeValue} + if groupType != 0 { + sql += ` JOIN message_group b ON b.group_id = a.group_id AND b.group_type = ?` + sqlParams = append(sqlParams, groupType) + } + sql += ` + WHERE a.deleted_at = ? + ` + sqlParams = append(sqlParams, utils.DefaultTimeValue) if groupID != 0 { - sql += " AND group_id = ?" + sql += " AND a.group_id = ?" sqlParams = append(sqlParams, groupID) } if memberUserID != "" { - sql += " AND member_user_id = ?" + sql += " AND a.member_user_id = ?" sqlParams = append(sqlParams, memberUserID) } err = GetRows(db, &messageGroupMembers, sql, sqlParams)