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

Merge branch 'feature-refund_v2-wxy-20241204' into test

This commit is contained in:
wangxinyu 2024-12-06 12:34:54 +08:00
parent 174e5045af c56de2019c
commit 19130f931d
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,7 @@ type ZoneRefundResp struct {
type ZoneRefundListReq struct { type ZoneRefundListReq struct {
base.BaseRequest base.BaseRequest
Zid int64 `json:"zid"` // 空间id Zid int64 `json:"zid"` // 空间id
BMid int64 `json:"b_mid"` // 主播 id
AuditType int64 `json:"audit_type"` // 审核状态 1：待处理，2：已处理 AuditType int64 `json:"audit_type"` // 审核状态 1：待处理，2：已处理
Offset int `json:"offset"` Offset int `json:"offset"`
Limit int `json:"limit"` Limit int `json:"limit"`

2
app/mix/controller/zone_vas_api.go
View File

@ -132,7 +132,7 @@ func ZoneRefundV2(ctx *gin.Context) {
func ZoneRefundList(ctx *gin.Context) { func ZoneRefundList(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*vasproto.ZoneRefundListReq) 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)) logger.Error("ZoneRefundList, invalid param, req: %v", util.ToJson(req))
ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam) ReplyErrCodeMsg(ctx, errcode.ErrCodeBadParam)
return return

4
app/mix/dao/mongo_vas.go
View File

@ -354,12 +354,12 @@ func (m *Mongo) GetWithdrawFreezeByMid(ctx *gin.Context, mid int64) (*dbstruct.W
} }
// 用户退款表：查询主播审核列表 // 用户退款表：查询主播审核列表
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) list := make([]*dbstruct.RefundInfo, 0)
doc := m.GetZoneRefund() doc := m.GetZoneRefund()
query := qmgo.M{ query := qmgo.M{
"zid": zid, "BMid": bMid,
"refunds_status": qmgo.M{ "refunds_status": qmgo.M{
"$in": refundsStatusList, "$in": refundsStatusList,
}, },

2
app/mix/service/logic/vas_zone.go
View File

@ -1215,7 +1215,7 @@ func (v *Vas) ZoneRefundList(ctx *gin.Context, req *vasproto.ZoneRefundListReq)
} else if req.AuditType == 2 { } else if req.AuditType == 2 {
refundsStatusList = append(refundsStatusList, dbstruct.RefundsApproved, dbstruct.RefundsRejected, dbstruct.RefundsOvertime) 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 { if err != nil {
return return
} }

1
dbstruct/vas_mongo.go
View File

@ -221,6 +221,7 @@ type RefundInfo struct {
Price int64 `json:"price" bson:"price"` Price int64 `json:"price" bson:"price"`
CoinPrice int64 `json:"coin_price" bson:"coin_price"` CoinPrice int64 `json:"coin_price" bson:"coin_price"`
Mid int64 `json:"mid" bson:"mid"` Mid int64 `json:"mid" bson:"mid"`
BMid int64 `json:"b_mid" bson:"b_mid"`
ByTime int64 `json:"by_time" bson:"by_time"` ByTime int64 `json:"by_time" bson:"by_time"`
RefundT int64 `json:"refund_t" bson:"refund_t"` RefundT int64 `json:"refund_t" bson:"refund_t"`
RefundsStatus int64 `json:"refunds_status" bson:"refunds_status"` RefundsStatus int64 `json:"refunds_status" bson:"refunds_status"`