From 2a9379677b27141a660702570884096a491d3ea8 Mon Sep 17 00:00:00 2001 From: wangxinyu Date: Fri, 6 Dec 2024 18:15:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/proto/vas/proto/vas.go | 3 +-- app/mix/controller/zone_vas_api.go | 6 +++--- app/mix/dao/mongo_vas.go | 2 +- app/mix/service/logic/vas_zone.go | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/proto/vas/proto/vas.go b/api/proto/vas/proto/vas.go index bdb9738a..c9622cd5 100644 --- a/api/proto/vas/proto/vas.go +++ b/api/proto/vas/proto/vas.go @@ -224,8 +224,7 @@ type ZoneRefundResp struct { type ZoneRefundListReq struct { base.BaseRequest Zid int64 `json:"zid"` // 空间id - Mid int64 `json:"mid"` // 用户 id - BMid int64 `json:"b_mid"` // 主播 id + Uid int64 `json:"mid"` // 用户 id AuditType int64 `json:"audit_type"` // 审核状态 1:待处理,2:已处理 Offset int `json:"offset"` Limit int `json:"limit"` diff --git a/app/mix/controller/zone_vas_api.go b/app/mix/controller/zone_vas_api.go index 92be2cf8..db085e0f 100644 --- a/app/mix/controller/zone_vas_api.go +++ b/app/mix/controller/zone_vas_api.go @@ -132,7 +132,7 @@ func ZoneRefundV2(ctx *gin.Context) { func ZoneRefundList(ctx *gin.Context) { req := ctx.MustGet("client_req").(*vasproto.ZoneRefundListReq) - if req.Mid <= 0 || req.BMid <= 0 { + if req.Mid <= 0 { logger.Error("ZoneRefundList, invalid param, req: %v", util.ToJson(req)) ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam) return @@ -169,7 +169,7 @@ func ZoneRefundList(ctx *gin.Context) { func ZoneRefundInfo(ctx *gin.Context) { req := ctx.MustGet("client_req").(*vasproto.ZoneRefundInfoReq) - if req.Mid <= 0 || req.AuditId == "" || len(req.AuditId) == 0 { + if req.AuditId == "" || len(req.AuditId) == 0 { logger.Error("ZoneRefundInfo, invalid param, req: %v", util.ToJson(req)) ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam) return @@ -194,7 +194,7 @@ func ZoneRefundInfo(ctx *gin.Context) { func ZoneRefundAudit(ctx *gin.Context) { req := ctx.MustGet("client_req").(*vasproto.ZoneRefundAuditReq) - if req.Mid <= 0 || req.AuditId == "" || len(req.AuditId) == 0 { + if req.AuditId == "" || len(req.AuditId) == 0 { logger.Error("ZoneRefundAudit, invalid param, req: %v", util.ToJson(req)) ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam) return diff --git a/app/mix/dao/mongo_vas.go b/app/mix/dao/mongo_vas.go index dc5f5bcf..acd5bb86 100644 --- a/app/mix/dao/mongo_vas.go +++ b/app/mix/dao/mongo_vas.go @@ -296,7 +296,7 @@ func (m *Mongo) GetZoneRefundList(ctx *gin.Context, bMid int64, refundsStatusLis doc := m.GetZoneRefund() query := qmgo.M{ - "BMid": bMid, + "b_mid": bMid, "refunds_status": qmgo.M{ "$in": refundsStatusList, }, diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go index 417857a0..c5813972 100644 --- a/app/mix/service/logic/vas_zone.go +++ b/app/mix/service/logic/vas_zone.go @@ -1100,7 +1100,7 @@ func (v *Vas) ZoneRefundList(ctx *gin.Context, req *vasproto.ZoneRefundListReq) } else if req.AuditType == 2 { refundsStatusList = append(refundsStatusList, dbstruct.RefundsApproved, dbstruct.RefundsRejected, dbstruct.RefundsOvertime) } - list, err = v.store.GetZoneRefundList(ctx, req.BMid, refundsStatusList) + list, err = v.store.GetZoneRefundList(ctx, req.Mid, refundsStatusList) if err != nil { return }