Fix CDK type checks and server naming ownership update
This commit is contained in:
@@ -258,7 +258,7 @@ func (s *CdkService) UseServerNamingCDK(ctx context.Context, code string, ownerI
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = tx.Model(model.NewServerShow()).Where("server_id", serverID).Data(g.Map{
|
||||
_, err = tx.Model(model.NewServerShow()).Where("server_id", serverID).Where("owner", ownerID).Data(g.Map{
|
||||
"name": updated.Name,
|
||||
"owner": updated.Owner,
|
||||
"expire_time": updated.ExpireTime,
|
||||
|
||||
@@ -268,7 +268,27 @@ func (s *ServerService) GetOwnerActiveDonationServers(ownerID uint32) []Donation
|
||||
|
||||
// CanUseDonationName 校验目标服务器在当前时间点是否允许被冠名。
|
||||
func (s *ServerService) CanUseDonationName(server model.ServerList, ownerID uint32, now time.Time) bool {
|
||||
return server.OnlineID != 0
|
||||
if server.OnlineID == 0 || ownerID == 0 {
|
||||
return false
|
||||
}
|
||||
|
||||
var shows []model.ServerShow
|
||||
dbm_nocache_noenable(model.NewServerShow()).Where("server_id", server.OnlineID).Scan(&shows)
|
||||
if len(shows) == 0 {
|
||||
return true
|
||||
}
|
||||
|
||||
for i := range shows {
|
||||
show := &shows[i]
|
||||
if show.Owner != ownerID {
|
||||
continue
|
||||
}
|
||||
if s.isActiveServerShow(show, now) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
func (s *ServerService) getRawServers() []model.ServerList {
|
||||
|
||||
Reference in New Issue
Block a user