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

Merge pull request 'feat-IRONFANS-112-Robin' (#414) from feat-IRONFANS-112-Robin into test 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/414
This commit is contained in:
chenhao 2024-05-08 22:55:36 +08:00
parent 8f03f31def 0614fd84e2
commit ae26ca61b5
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/consts/status.go
View File

@ -232,6 +232,12 @@ const (
IsHeaded_Yes = 1 //是
)
// 是否隐藏
const (
IsHided_No = 0 //否
IsHided_Yes = 1 //是
)
// 从未更新的时间跨度
const (
DaysElapsedSinceTheLastZonesUpdate_Never = -1

4
app/mix/service/apiservice.go
View File

@ -3109,7 +3109,7 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
vo = nil
return
}
if zoneThirdPartner.GetIsHided() == 1 {
if zoneThirdPartner.GetIsHided() == consts.IsHided_Yes {
zoneThirdPartner.ThirdPartnerMid = nil
zoneThirdPartner.SharingRatio = nil
vo = &zone_third_partner_proto.ZoneThirdPartnerApiVO{
@ -3138,7 +3138,6 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
ZoneThirdPartner: zoneThirdPartner,
Account: acctVO,
}
vo.ZoneThirdPartner.IsHided = goproto.Int64(vo.ZoneThirdPartner.GetIsHided())
return
}
@ -3284,7 +3283,6 @@ func (s *Service) ApiGetZoneCollaboratorList(ctx *gin.Context, req *zone_collabo
ZoneThirdPartner: zoneThirdPartner,
Account: acctVO,
}
ztpVO.ZoneThirdPartner.IsHided = goproto.Int64(ztpVO.ZoneThirdPartner.GetIsHided())
return
}

1
app/mix/service/logic/zone_third_partner.go
View File

@ -31,6 +31,7 @@ func (p *ZoneThirdPartner) OpCreate(ctx *gin.Context, req *zone_third_partner_pr
req.ZoneThirdPartner.Ct = goproto.Int64(time.Now().Unix())
req.ZoneThirdPartner.Ut = goproto.Int64(time.Now().Unix())
req.ZoneThirdPartner.DelFlag = goproto.Int64(consts.Exist)
req.ZoneThirdPartner.IsHided = goproto.Int64(consts.IsHided_No)
err := p.store.CreateZoneThirdPartner(ctx, req.ZoneThirdPartner)
if err != nil {
logger.Error("CreateZoneThirdPartner fail, err: %v", err)

1
app/mix/service/service.go
View File

@ -3836,7 +3836,6 @@ func (s *Service) OpGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_pa
ZoneThirdPartner: zoneThirdPartner,
Account: acctVO,
}
vo.ZoneThirdPartner.IsHided = goproto.Int64(vo.ZoneThirdPartner.GetIsHided())
return
}