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

Merge pull request 'by Robin at 20240525; set ztp=nil if no ztp exists' (#503) from feat-IRONFANS-118-Robin-2 into main 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/503
This commit is contained in:
chenhao 2024-05-25 12:03:46 +08:00
parent 2e572ca814 531c84a2ea
commit ba5d4f00f0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3049,18 +3049,6 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
return
}
if zone.GetIsZoneThirdPartnerHided() == consts.IsHided_Yes {
vo = &zone_third_partner_proto.ZoneThirdPartnerApiVO{
ZoneThirdPartner: &dbstruct.ZoneThirdPartner{
Zid: req.Zid,
ThirdPartnerMid: nil,
SharingRatio: nil,
},
IsHided: consts.IsHided_Yes,
}
return
}
zoneThirdPartner, err := _DefaultZoneThirdPartner.OpList(ctx, &zone_third_partner_proto.OpListReq{
BaseRequest: req.BaseRequest,
Zid: req.Zid,
@ -3075,6 +3063,18 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
return
}
if zone.GetIsZoneThirdPartnerHided() == consts.IsHided_Yes {
vo = &zone_third_partner_proto.ZoneThirdPartnerApiVO{
ZoneThirdPartner: &dbstruct.ZoneThirdPartner{
Zid: req.Zid,
ThirdPartnerMid: nil,
SharingRatio: nil,
},
IsHided: consts.IsHided_Yes,
}
return
}
acct, err := _DefaultAccount.OpListByMid(ctx, &accountproto.OpListByMidReq{
Mid: zoneThirdPartner.ThirdPartnerMid,
})