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

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

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/509
This commit is contained in:
chenhao 2024-05-25 19:03:36 +08:00
parent 1ac088da88 bda85caf00
commit 72067fa808
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mix/dao/mongo.go
View File

@ -4677,7 +4677,7 @@ func (m *Mongo) GetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_partne
"zid": util.DerefInt64(req.Zid), "zid": util.DerefInt64(req.Zid),
"del_flag": 0, "del_flag": 0,
} }
err := col.Find(ctx, query).One(&zoneThirdPartner) err := col.Find(ctx, query).One(zoneThirdPartner)
if err == qmgo.ErrNoSuchDocuments { if err == qmgo.ErrNoSuchDocuments {
err = nil err = nil
return nil, err return nil, err

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

@ -3051,18 +3051,6 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
return 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{ acct, err := _DefaultAccount.OpListByMid(ctx, &accountproto.OpListByMidReq{
Mid: zoneThirdPartner.ThirdPartnerMid, Mid: zoneThirdPartner.ThirdPartnerMid,
}) })
@ -3082,7 +3070,7 @@ func (s *Service) ApiGetZoneThirdPartnerList(ctx *gin.Context, req *zone_third_p
vo = &zone_third_partner_proto.ZoneThirdPartnerApiVO{ vo = &zone_third_partner_proto.ZoneThirdPartnerApiVO{
ZoneThirdPartner: zoneThirdPartner, ZoneThirdPartner: zoneThirdPartner,
Account: acctVO, Account: acctVO,
IsHided: consts.IsHided_No, IsHided: zone.GetIsZoneThirdPartnerHided(),
} }
return return