From 1e974bc7e53d2c9f460eb1e5fa7cf225b7dadb52 Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Thu, 5 Dec 2024 14:44:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=20debug=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/proto/vas/proto/vas.go         | 4 ++--
 app/mix/controller/zone_vas_api.go | 4 ++--
 app/mix/dao/mongo_vas.go           | 8 +++++---
 app/mix/service/logic/vas_zone.go  | 8 +++++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/api/proto/vas/proto/vas.go b/api/proto/vas/proto/vas.go
index 13580508..0b8824ef 100644
--- a/api/proto/vas/proto/vas.go
+++ b/api/proto/vas/proto/vas.go
@@ -251,7 +251,7 @@ type ZoneRefundListVo struct {
 // 空间退款详情
 type ZoneRefundInfoReq struct {
 	base.BaseRequest
-	Zid     int64  `json:"zid"`      // 空间 id
+	//Zid     int64  `json:"zid"`      // 空间 id
 	AuditId string `json:"audit_id"` // 审核 id（列表 id）
 }
 
@@ -272,7 +272,7 @@ type ZoneRefundAuditReq struct {
 	base.BaseRequest
 	Zid           int64  `json:"zid"`            // 空间 id
 	AuditId       string `json:"audit_id"`       // 审核 id（列表 id）
-	RefundsStatus string `json:"refunds_status"` // 审核 id（列表 id）
+	RefundsStatus string `json:"refunds_status"` // 退款状态
 }
 
 // 更新空间价格信息
diff --git a/app/mix/controller/zone_vas_api.go b/app/mix/controller/zone_vas_api.go
index 3f82cdd9..e398dc0c 100644
--- a/app/mix/controller/zone_vas_api.go
+++ b/app/mix/controller/zone_vas_api.go
@@ -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.Mid <= 0 || 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.Mid <= 0 || 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 3378701c..df888bf0 100644
--- a/app/mix/dao/mongo_vas.go
+++ b/app/mix/dao/mongo_vas.go
@@ -291,13 +291,15 @@ func (m *Mongo) AddWithdrawHis(ctx *gin.Context, doc *dbstruct.WithdrawHis) erro
 }
 
 // 用户退款表：查询主播审核列表
-func (m *Mongo) GetZoneRefundList(ctx *gin.Context, zid int64, auditType int64) ([]*dbstruct.RefundInfo, error) {
+func (m *Mongo) GetZoneRefundList(ctx *gin.Context, zid int64, refundsStatusList []int64) ([]*dbstruct.RefundInfo, error) {
 	list := make([]*dbstruct.RefundInfo, 0)
 	doc := m.GetZoneRefund()
 
 	query := qmgo.M{
-		"zid":        zid,
-		"audit_type": auditType,
+		"zid": zid,
+		"refunds_status": qmgo.M{
+			"$in": refundsStatusList,
+		},
 	}
 	err := doc.Find(ctx, query).All(&list)
 	if errors.Is(err, qmgo.ErrNoSuchDocuments) {
diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go
index 9ecb1839..21d9a806 100644
--- a/app/mix/service/logic/vas_zone.go
+++ b/app/mix/service/logic/vas_zone.go
@@ -1093,7 +1093,13 @@ func (v *Vas) ZoneRefundV2(ctx *gin.Context, req *vasproto.ZoneRefundReq) error
 
 // 退款审核列表页
 func (v *Vas) ZoneRefundList(ctx *gin.Context, req *vasproto.ZoneRefundListReq) (list []*dbstruct.RefundInfo, err error) {
-	list, err = v.store.GetZoneRefundList(ctx, req.Zid, req.AuditType)
+	refundsStatusList := make([]int64, 0)
+	if req.AuditType == 1 {
+		refundsStatusList = append(refundsStatusList, dbstruct.Refunds_Awaiting)
+	} else if req.AuditType == 2 {
+		refundsStatusList = append(refundsStatusList, dbstruct.Refunds_Approved, dbstruct.Refunds_Rejected, dbstruct.Refunds_Overtime)
+	}
+	list, err = v.store.GetZoneRefundList(ctx, req.Zid, refundsStatusList)
 	if err != nil {
 		return
 	}