diff --git a/api/proto/vas/proto/vas.go b/api/proto/vas/proto/vas.go index 2c8f69cc..7dccd67d 100644 --- a/api/proto/vas/proto/vas.go +++ b/api/proto/vas/proto/vas.go @@ -224,6 +224,7 @@ type ZoneRefundResp struct { type ZoneRefundListReq struct { base.BaseRequest Zid int64 `json:"zid"` // 空间id + BMid int64 `json:"b_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 b4621489..92be2cf8 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.Zid <= 0 { + if req.Mid <= 0 || req.BMid <= 0 { logger.Error("ZoneRefundList, 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 bb25d11f..dc5f5bcf 100644 --- a/app/mix/dao/mongo_vas.go +++ b/app/mix/dao/mongo_vas.go @@ -291,12 +291,12 @@ func (m *Mongo) AddWithdrawHis(ctx *gin.Context, doc *dbstruct.WithdrawHis) erro } // 用户退款表:查询主播审核列表 -func (m *Mongo) GetZoneRefundList(ctx *gin.Context, zid int64, refundsStatusList []int64) ([]*dbstruct.RefundInfo, error) { +func (m *Mongo) GetZoneRefundList(ctx *gin.Context, bMid int64, refundsStatusList []int64) ([]*dbstruct.RefundInfo, error) { list := make([]*dbstruct.RefundInfo, 0) doc := m.GetZoneRefund() query := qmgo.M{ - "zid": zid, + "BMid": 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 38bb18df..417857a0 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.Zid, refundsStatusList) + list, err = v.store.GetZoneRefundList(ctx, req.BMid, refundsStatusList) if err != nil { return } diff --git a/dbstruct/vas_mongo.go b/dbstruct/vas_mongo.go index 1699013e..488ca34f 100644 --- a/dbstruct/vas_mongo.go +++ b/dbstruct/vas_mongo.go @@ -204,6 +204,7 @@ type RefundInfo struct { Price int64 `json:"price" bson:"price"` CoinPrice int64 `json:"coin_price" bson:"coin_price"` Mid int64 `json:"mid" bson:"mid"` + BMid int64 `json:"b_mid" bson:"b_mid"` ByTime int64 `json:"by_time" bson:"by_time"` RefundT int64 `json:"refund_t" bson:"refund_t"` RefundsStatus int64 `json:"refunds_status" bson:"refunds_status"`