wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'dev-feat-IRONFANS-70-Robin' (#292) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/292
This commit is contained in:
chenhao 2024-04-16 19:04:49 +08:00
parent 7553739396 3940762760
commit f694b2f5e2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/mix/service/utilservice.go
View File

@ -1559,14 +1559,15 @@ func (s *Service) utilFillZonesWithApiVOInfo(ctx *gin.Context, list []*dbstruct.
vo.Expenditure = zidZuMap[zid].GetConsume() vo.Expenditure = zidZuMap[zid].GetConsume()
// 填充铁粉解锁信息 // 填充铁粉解锁信息
if zidZuMap[zid].IsUnlockIronfanship() { zu, ok := zidZuMap[zid]
if ok && zu.IsUnlockIronfanship() {
vo.IsIronfanshipUnlocked = consts.IsIronfanshipUnlocked_Yes vo.IsIronfanshipUnlocked = consts.IsIronfanshipUnlocked_Yes
} else { } else {
vo.IsIronfanshipUnlocked = consts.IsIronfanshipUnlocked_No vo.IsIronfanshipUnlocked = consts.IsIronfanshipUnlocked_No
} }
// 填充超粉解锁信息 // 填充超粉解锁信息
if zidZuMap[zid].IsUnlockSuperfanship() { if ok && zu.IsUnlockSuperfanship() {
vo.IsSuperfanshipUnlocked = consts.IsSuperfanshipUnlocked_Yes vo.IsSuperfanshipUnlocked = consts.IsSuperfanshipUnlocked_Yes
} else { } else {
vo.IsSuperfanshipUnlocked = consts.IsSuperfanshipUnlocked_No vo.IsSuperfanshipUnlocked = consts.IsSuperfanshipUnlocked_No

9
dbstruct/vas_mysql.go
View File

@ -948,6 +948,9 @@ type ZoneUnlock struct {
} }
func (p *ZoneUnlock) IsUnlockAdmission() bool { func (p *ZoneUnlock) IsUnlockAdmission() bool {
if p == nil {
return false
}
if p.AdmissionCt == nil { if p.AdmissionCt == nil {
return false return false
} }
@ -958,6 +961,9 @@ func (p *ZoneUnlock) IsUnlockAdmission() bool {
} }
func (p *ZoneUnlock) IsUnlockIronfanship() bool { func (p *ZoneUnlock) IsUnlockIronfanship() bool {
if p == nil {
return false
}
if p.IronfanshipCt == nil { if p.IronfanshipCt == nil {
return false return false
} }
@ -968,6 +974,9 @@ func (p *ZoneUnlock) IsUnlockIronfanship() bool {
} }
func (p *ZoneUnlock) IsUnlockSuperfanship() bool { func (p *ZoneUnlock) IsUnlockSuperfanship() bool {
if p == nil {
return false
}
if p.SuperfanshipCt == nil { if p.SuperfanshipCt == nil {
return false return false
} }