weiduxiaoxi
This commit is contained in:
@@ -21,9 +21,10 @@ type UserDeliveryAddressEx struct {
|
||||
type GetSelfInfoResult struct {
|
||||
model.User
|
||||
model.UserBill
|
||||
WaitCashPrice int `json:"waitCashPrice"`
|
||||
UserMembers []*model.UserMember `json:"userMembers"`
|
||||
PopedUserName string `json:"popedUserName"`
|
||||
WaitCashPrice int `json:"waitCashPrice"`
|
||||
UserMembers []*model.UserMember `json:"userMembers"`
|
||||
PopedUserName string `json:"popedUserName"`
|
||||
UnReadMessageCount int `json:"unReadMessageCount"`
|
||||
}
|
||||
|
||||
func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err error) {
|
||||
@@ -58,6 +59,13 @@ func GetUserByIDWithMembers(db *DaoDB, fieldName, fieldValue string) (getSelfInf
|
||||
}
|
||||
// globals.SugarLogger.Debugf("GetUserByID sql:%s, sqlParams:%s", sql, utils.Format4Output(sqlParams, false))
|
||||
err = GetRow(db, &getSelfInfoResult, sql, sqlParams...)
|
||||
if messageGroupReads, err := GetMessageGroupRead(db, getSelfInfoResult.User.UserID, 0); err == nil {
|
||||
var unReadCount int
|
||||
for _, v := range messageGroupReads {
|
||||
unReadCount += v.UnReadCount
|
||||
}
|
||||
getSelfInfoResult.UnReadMessageCount = unReadCount
|
||||
}
|
||||
return getSelfInfoResult, err
|
||||
}
|
||||
|
||||
|
||||
@@ -206,6 +206,7 @@ type GetMessageGroupsResult struct {
|
||||
LastTime time.Time `json:"lastTime"`
|
||||
LastUserName string `json:"lastUserName"`
|
||||
UserName string `json:"userName"`
|
||||
UnReadMessageCount int `json:"unReadMessageCount"`
|
||||
MessageGroupMembers []*GetMessageGroupsMemberResult `json:"messageGroupMembers"`
|
||||
}
|
||||
|
||||
@@ -303,3 +304,22 @@ func GetUserMessageGroups(db *DaoDB, userID string) (messageGroup []*model.Messa
|
||||
err = GetRows(db, &messageGroup, sql, sqlParams)
|
||||
return messageGroup, err
|
||||
}
|
||||
|
||||
func GetMessageGroupRead(db *DaoDB, userID string, groupID int) (messageGroupReads []*model.MessageGroupRead, err error) {
|
||||
sql := `
|
||||
SELECT *
|
||||
FROM message_group_read a
|
||||
WHERE 1 = 1
|
||||
`
|
||||
sqlParams := []interface{}{}
|
||||
if userID != "" {
|
||||
sql += ` AND a.user_id = ?`
|
||||
sqlParams = append(sqlParams, userID)
|
||||
}
|
||||
if groupID != 0 {
|
||||
sql += ` AND a.group_id = ?`
|
||||
sqlParams = append(sqlParams, groupID)
|
||||
}
|
||||
err = GetRows(db, &messageGroupReads, sql, sqlParams...)
|
||||
return messageGroupReads, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user