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

Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-18 23:00:07 +08:00
parent 372e548c5d 780fb7ab32
commit f4f3f7482b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/proto/vas/proto/vas.go
View File

@ -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 {

10
app/mix/service/vasservice.go
View File

@ -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
@ -733,7 +733,7 @@ func (s *Service) ZoneGetCashier(ctx *gin.Context, req *vasproto.ZoneGetCashierR
}
// 用户是否解锁了空间超粉
zuMap, _ := _DefaultVas.GetZoneUnlockMapByMidZids(ctx, mid, []int64{zid})
if zu, ok := zuMap[mid]; ok && zu.IsUnlockSuperfanship() {
if zu, ok := zuMap[zid]; ok && zu.IsUnlockSuperfanship() {
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{