cms

pkg/common/db/RedisModel.go

@@ -398,12 +398,17 @@ func (d *DataBases) GetGetuiToken() (string, error) {
 	return result, err
 }
 
-func (d *DataBases) SetSendMsgFailedFlag(operationID string) error {
-	return d.RDB.Set(context.Background(), sendMsgFailedFlag+operationID, 1, time.Hour*24).Err()
+func (d *DataBases) SetSendMsgStatus(status int32, operationID string) error {
+	return d.RDB.Set(context.Background(), sendMsgFailedFlag+operationID, status, time.Hour*24).Err()
 }
 
-func (d *DataBases) GetSendMsgStatus(operationID string) error {
-	return d.RDB.Get(context.Background(), sendMsgFailedFlag+operationID).Err()
+func (d *DataBases) GetSendMsgStatus(operationID string) (int, error) {
+	result, err := d.RDB.Get(context.Background(), sendMsgFailedFlag+operationID).Result()
+	if err != nil {
+		return 0, err
+	}
+	status, err := strconv.Atoi(result)
+	return status, err
 }
 
 func (d *DataBases) SetFcmToken(account string, platformid int, fcmToken string, expireTime int64) (err error) {

pkg/common/db/mysql_model/im_mysql_model/invitation_model.go

@@ -3,9 +3,10 @@ package im_mysql_model
 import (
 	"Open_IM/pkg/common/db"
 	"errors"
-	"github.com/jinzhu/gorm"
 	"math/rand"
 	"time"
+
+	"github.com/jinzhu/gorm"
 )
 
 /**
@@ -105,9 +106,12 @@ func CreateRandomString(strlen int) string {
 	return string(result)
 }
 
-func GetInvitationCodes(showNumber, pageNumber, status int32) ([]db.Invitation, error) {
+func GetInvitationCodes(showNumber, pageNumber, status int32) ([]db.Invitation, int64, error) {
 	var invitationList []db.Invitation
-	err := db.DB.MysqlDB.DefaultGormDB().Model(db.Invitation{}).Limit(int(showNumber)).Offset(int(showNumber*(pageNumber-1))).Where("status=?", status).
+	db := db.DB.MysqlDB.DefaultGormDB().Model(db.Invitation{}).Where("status=?", status)
+	var count int64
+	err := db.Count(&count).Error
+	err = db.Limit(int(showNumber)).Offset(int(showNumber * (pageNumber - 1))).
 		Order("create_time desc").Find(&invitationList).Error
-	return invitationList, err
+	return invitationList, count, err
 }

pkg/common/db/mysql_model/im_mysql_model/ip_model.go

@@ -81,8 +81,14 @@ func InsertIpRecord(userID, createIp string) error {
 	return err
 }
 
-func UpdateIpReocord(userID, ip string) error {
+func UpdateIpReocord(userID, ip string) (err error) {
 	record := &db.UserIpRecord{UserID: userID, LastLoginIp: ip, LastLoginTime: time.Now()}
-	err := db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpRecord{}).Updates(record).Updates("login_times = login_times + 1").Error
+	result := db.DB.MysqlDB.DefaultGormDB().Model(&db.UserIpRecord{}).Where("user_id=?", userID).Updates(record).Updates("login_times = login_times + 1")
+	if result.Error != nil {
+		return result.Error
+	}
+	if result.RowsAffected == 0 {
+		err = InsertIpRecord(userID, ip)
+	}
 	return err
 }