diff --git a/api/proto/vas/proto/vas.go b/api/proto/vas/proto/vas.go index ad0b3c16..41c1cfb7 100644 --- a/api/proto/vas/proto/vas.go +++ b/api/proto/vas/proto/vas.go @@ -217,8 +217,8 @@ type UpdateZoneMomentPriceResp struct { // 获取空间成员 type GetZoneMemberListReq struct { base.BaseRequest - Zid int64 `json:"zid"` - MemType int32 `json:"mem_type"` + Zid int64 `json:"zid"` + MemberType int32 `json:"member_type"` } type ZoneMemberVo struct { diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go index 0076c7cd..f2561ff7 100644 --- a/app/mix/service/vasservice.go +++ b/app/mix/service/vasservice.go @@ -699,7 +699,7 @@ func (s *Service) ZoneGetCashier(ctx *gin.Context, req *vasproto.ZoneGetCashierR // 是否解锁了空间普通会员 zuMap, _ := _DefaultVas.GetZoneUnlockMapByMidZids(ctx, mid, []int64{zid}) logger.Info("GetZoneUnlockMapByMidZids, mid: %v, zid: %v, zuMap: %v", mid, zid, util.ToJson(zuMap)) - if zu, ok := zuMap[mid]; ok && zu.IsUnlockAdmission() { + if zu, ok := zuMap[zid]; ok && zu.IsUnlockAdmission() { ec = errcode.ErrCodeVasSrvOk data.HasBought = 1 return data, ec, nil @@ -774,7 +774,7 @@ func (s *Service) ZoneMemberList(ctx *gin.Context, req *vasproto.GetZoneMemberLi list = make([]*vasproto.ZoneMemberVo, 0) // 获取成员列表 - zmList, err := _DefaultVas.GetZoneMemberList(ctx, req.Zid, req.MemType) + zmList, err := _DefaultVas.GetZoneMemberList(ctx, req.Zid, req.MemberType) ec, err = errs.DealVasErr(err) if err != nil { logger.Error("ZoneRefund fail, err: %v", err) @@ -784,11 +784,11 @@ func (s *Service) ZoneMemberList(ctx *gin.Context, req *vasproto.GetZoneMemberLi for _, zm := range zmList { mids = append(mids, zm.GetMid()) } - logger.Info("ZoneMemberList, zid: %v, typ: %v, mids: %v, zmList: %v", req.Zid, req.MemType, mids, util.ToJson(zmList)) + logger.Info("ZoneMemberList, zid: %v, typ: %v, mids: %v, zmList: %v", req.Zid, req.MemberType, mids, util.ToJson(zmList)) // 获取用户信息 acntMap, _ := _DefaultAccount.GetAccountMapByMids(ctx, mids) - logger.Info("GetAccountMapByMids, zid: %v, typ: %v, acntMap: %v", req.Zid, req.MemType, util.ToJson(acntMap)) + logger.Info("GetAccountMapByMids, zid: %v, typ: %v, acntMap: %v", req.Zid, req.MemberType, util.ToJson(acntMap)) for _, zm := range zmList { mid := zm.GetMid() tmp := &vasproto.ZoneMemberVo{