Merge branch 'refs/heads/feat-user-sync'

This commit is contained in:
junleea 2024-12-16 20:48:10 +08:00
commit ed7e5e68ef
1 changed files with 3 additions and 8 deletions

View File

@ -113,10 +113,7 @@ func UpdateUserByID3(id int, req proto.UpdateUserInfoReq) error {
// 用户数据同步-添加 // 用户数据同步-添加
func AddUserSync(req proto.UserAddOrUpdate) uint { func AddUserSync(req proto.UserAddOrUpdate) uint {
res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime) res := DB.Exec("insert into users (id, created_at, updated_at, deleted_at, name, age, email, password,gender,role,redis,run,upload,video_func,device_func,cid_func,avatar,create_time,update_time) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", req.ID, req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime)
if res.Error != nil { res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID)
return 0
}
res = DB.Exec("update users set created_at=null where id=?", req.ID)
if res.Error != nil { if res.Error != nil {
return 0 return 0
} }
@ -125,11 +122,9 @@ func AddUserSync(req proto.UserAddOrUpdate) uint {
// 用户数据同步-更新 // 用户数据同步-更新
func UpdateUserSync(req proto.UserAddOrUpdate) uint { func UpdateUserSync(req proto.UserAddOrUpdate) uint {
//事务
res := DB.Exec("update users set created_at=?, updated_at=?, deleted_at=?, name=?, age=?, email=?, password=?,gender=?,role=?,redis=?,run=?,upload=?,video_func=?,device_func=?,cid_func=?,avatar=?,create_time=?,update_time=? where id=?", req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime, req.ID) res := DB.Exec("update users set created_at=?, updated_at=?, deleted_at=?, name=?, age=?, email=?, password=?,gender=?,role=?,redis=?,run=?,upload=?,video_func=?,device_func=?,cid_func=?,avatar=?,create_time=?,update_time=? where id=?", req.CreatedAt, req.UpdatedAt, req.DeletedAt, req.Name, req.Age, req.Email, req.Password, req.Gender, req.Role, req.Redis, req.Run, req.Upload, req.VideoFunc, req.DeviceFunc, req.CIDFunc, req.Avatar, req.CreateTime, req.UpdateTime, req.ID)
if res.Error != nil { res = DB.Debug().Exec("update users set created_at=null where id=?", req.ID)
return 0
}
res = DB.Exec("update users set created_at=null where id=?", req.ID)
if res.Error != nil { if res.Error != nil {
return 0 return 0
} }