Merge pull request 'main' (#504) from main into test

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/504
This commit is contained in:
chenhao 2024-05-25 12:03:58 +08:00
commit e01f367782
1 changed files with 12 additions and 12 deletions

View File

@ -3037,18 +3037,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,
@ -3063,6 +3051,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,
})