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

fencheng

Browse Source
This commit is contained in:
苏尹岚
2020-11-16 14:14:21 +08:00
parent 0c140fa4c1
commit c7e52925c1
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/job.go
View File

@@ -500,6 +500,16 @@ func AuditJob(ctx *jxcontext.Context, jobOrderID, status int, comment string) (e
return return
} }
if status == model.JobOrderStatusAuditPass { 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, "") userBillJobOrder, err := dao.GetUserBill(db, jobOrder.UserID, "")
if err = financial.AddIncomeUpdateAccount(db, userBillJobOrder, model.BillTypeJob, job.AvgPrice); err != nil { if err = financial.AddIncomeUpdateAccount(db, userBillJobOrder, model.BillTypeJob, job.AvgPrice); err != nil {

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

@@ -209,7 +209,7 @@ func GetMessageGroupByUser(ctx *jxcontext.Context, userID string) (messageGroupR
db = dao.GetDB() db = dao.GetDB()
) )
messageGroups, err := dao.GetMessageGroups(db, userID, 0, 0, true, "") 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 { for _, v := range messageGroupMembers {
if messageGroupList, err := dao.GetMessageGroups(db, "", v.GroupID, 0, false, ""); err == nil { if messageGroupList, err := dao.GetMessageGroups(db, "", v.GroupID, 0, false, ""); err == nil {
messageGroups = append(messageGroups, messageGroupList...) messageGroups = append(messageGroups, messageGroupList...)
@@ -254,7 +254,7 @@ func AddMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err er
var ( var (
db = dao.GetDB() db = dao.GetDB()
) )
messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, userID) messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID)
if err != nil { if err != nil {
return err return err
} }
@@ -312,7 +312,7 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err
//token中用户与传入user不一致就判定为踢人 //token中用户与传入user不一致就判定为踢人
if ctx.GetUserID() != userID { if ctx.GetUserID() != userID {
if messageGroup.UserID != ctx.GetUserID() { 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 { if err != nil {
return errCode, err return errCode, err
} }
@@ -320,7 +320,7 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string) (err
return errCode, fmt.Errorf("只有创建者和管理员才能踢人！") return errCode, fmt.Errorf("只有创建者和管理员才能踢人！")
} }
} }
messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, userID) messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID)
if err != nil { if err != nil {
return errCode, err return errCode, err
} }

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

@@ -239,19 +239,26 @@ func GetMessageGroups(db *DaoDB, userID string, groupID, groupType int, isMember
return messageGroupsResult, err 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 := ` sql := `
SELECT * SELECT a.*
FROM message_group_member FROM message_group_member a
WHERE deleted_at = ?
` `
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 { if groupID != 0 {
sql += " AND group_id = ?" sql += " AND a.group_id = ?"
sqlParams = append(sqlParams, groupID) sqlParams = append(sqlParams, groupID)
} }
if memberUserID != "" { if memberUserID != "" {
sql += " AND member_user_id = ?" sql += " AND a.member_user_id = ?"
sqlParams = append(sqlParams, memberUserID) sqlParams = append(sqlParams, memberUserID)
} }
err = GetRows(db, &messageGroupMembers, sql, sqlParams) err = GetRows(db, &messageGroupMembers, sql, sqlParams)