From 142b2f0ba5a9b1c0de69b23a01fefaf79f1376fa Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Sat, 21 Dec 2024 15:21:26 +0800
Subject: [PATCH] no message

---
 statistics/modelmysql/log_login.go    | 10 +++++-----
 statistics/modelmysql/tables.go       |  4 ++--
 statistics/modelmysql/user_account.go |  1 +
 statistics/syn/log_login.go           | 14 +++++++-------
 statistics/syn/user_account.go        | 28 +++++++++++++--------------
 5 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/statistics/modelmysql/log_login.go b/statistics/modelmysql/log_login.go
index 912d748..20bc4e3 100644
--- a/statistics/modelmysql/log_login.go
+++ b/statistics/modelmysql/log_login.go
@@ -9,13 +9,13 @@ const (
 )
 
 type LogLogin struct {
-	ID         uint `gorm:"primaryKey"`
-	Snid       int  `gorm:"index"`
-	OnlineType int  `gorm:"index"`
-	//OnlineTs    int       `gorm:"index"`
+	ID          uint      `gorm:"primaryKey"`
+	Snid        int       `gorm:"index"`
+	OnlineType  int       `gorm:"index"`
+	OnlineTs    int64     `gorm:"index"`
 	OnlineTime  time.Time `gorm:"index"`
 	OfflineType int       `gorm:"index"`
-	//OfflineTs   int       `gorm:"index"`
+	OfflineTs   int64     `gorm:"index"`
 	OfflineTime time.Time `gorm:"index"`
 	ChannelId   string    `gorm:"index"` // 推广渠道
 
diff --git a/statistics/modelmysql/tables.go b/statistics/modelmysql/tables.go
index e235936..88e3ccc 100644
--- a/statistics/modelmysql/tables.go
+++ b/statistics/modelmysql/tables.go
@@ -8,8 +8,8 @@ var Tables = []interface{}{
 	&LogLogin{},
 	&LogLoginMid{},
 	&UserAccount{},
-	&UserLogin{},
-	&UserID{},
+	//&UserLogin{},
+	//&UserID{},
 	&LogInviteScoreMid{},
 	&LogInviteScore{},
 	&LogInviteUser{},
diff --git a/statistics/modelmysql/user_account.go b/statistics/modelmysql/user_account.go
index 0d56bbf..e1701c6 100644
--- a/statistics/modelmysql/user_account.go
+++ b/statistics/modelmysql/user_account.go
@@ -8,6 +8,7 @@ type UserAccount struct {
 	Snid int `gorm:"index"`
 	//RegisterTs   int       `gorm:"index"`
 	RegisterTime time.Time `gorm:"index"`
+	RegisterTs   int64     `gorm:"index"`
 	ChannelId    string    `gorm:"index"` // 推广渠道
 
 	DeviceName   string `gorm:"index"`
diff --git a/statistics/syn/log_login.go b/statistics/syn/log_login.go
index 5a1c8e7..8ef2745 100644
--- a/statistics/syn/log_login.go
+++ b/statistics/syn/log_login.go
@@ -91,12 +91,12 @@ func LogLogin(platform string, batchSize int) ([]*mysqlmodel.LogLogin, error) {
 
 			if n == 0 {
 				e = &mysqlmodel.LogLogin{
-					Snid:       int(v.SnId),
-					OnlineType: onlineType,
-					//OnlineTs:     int(v.Ts),
-					OnlineTime:  v.Time,
-					OfflineType: 0,
-					//OfflineTs:    0,
+					Snid:         int(v.SnId),
+					OnlineType:   onlineType,
+					OnlineTs:     v.Time.Unix(),
+					OnlineTime:   v.Time,
+					OfflineType:  0,
+					OfflineTs:    0,
 					OfflineTime:  v.Time,
 					DeviceName:   v.DeviceName,
 					AppVersion:   v.AppVersion,
@@ -132,7 +132,7 @@ func LogLogin(platform string, batchSize int) ([]*mysqlmodel.LogLogin, error) {
 			}
 
 			e.OfflineType = mysqlmodel.LogTypeOffline
-			//e.OfflineTs = int(v.Ts)
+			e.OfflineTs = v.Time.Unix()
 			e.OfflineTime = v.Time
 			if err = db.Model(e).Select("OfflineType", "OfflineTime").Updates(e).Error; err != nil {
 				logger.Logger.Errorf("mysql: SyncLogLogin failed to update log_login: %v", err)
diff --git a/statistics/syn/user_account.go b/statistics/syn/user_account.go
index 72b1c52..6f10edd 100644
--- a/statistics/syn/user_account.go
+++ b/statistics/syn/user_account.go
@@ -68,9 +68,9 @@ func UserAccount(platform string, batchSize int) ([]*mysqlmodel.UserAccount, err
 		for _, v := range accounts {
 			logger.Logger.Tracef("mongo account: %+v", *v)
 			a := &mysqlmodel.UserAccount{
-				MID:  v.AccountId.Hex(),
-				Snid: int(v.SnId),
-				//RegisterTs:   int(v.RegisterTs),
+				MID:          v.AccountId.Hex(),
+				Snid:         int(v.SnId),
+				RegisterTs:   v.RegisteTime.Unix(),
 				RegisterTime: v.RegisteTime,
 				Tel:          v.Tel,
 				ChannelId:    v.ChannelId,
@@ -81,17 +81,17 @@ func UserAccount(platform string, batchSize int) ([]*mysqlmodel.UserAccount, err
 				return err
 			}
 
-			if err = tx.First(&mysqlmodel.UserID{}, "snid = ?", v.SnId).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				logger.Logger.Errorf("mysql: UserAccount failed to find user_id: %v", err)
-				return err
-			}
-
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				if err = tx.Create(&mysqlmodel.UserID{Snid: int(v.SnId)}).Error; err != nil {
-					logger.Logger.Errorf("mysql: UserAccount failed to create user_id: %v", err)
-					return err
-				}
-			}
+			//if err = tx.First(&mysqlmodel.UserID{}, "snid = ?", v.SnId).Error; err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			//	logger.Logger.Errorf("mysql: UserAccount failed to find user_id: %v", err)
+			//	return err
+			//}
+			//
+			//if errors.Is(err, gorm.ErrRecordNotFound) {
+			//	if err = tx.Create(&mysqlmodel.UserID{Snid: int(v.SnId)}).Error; err != nil {
+			//		logger.Logger.Errorf("mysql: UserAccount failed to create user_id: %v", err)
+			//		return err
+			//	}
+			//}
 
 			as = append(as, a)
 		}