From 17902f8c2d8b91e6364b9c26c18ef3f1d2174914 Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Tue, 10 Dec 2024 10:34:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/proto/vas/proto/vas.go        |  1 +
 app/mix/service/logic/vas_zone.go |  2 +-
 app/mix/service/vasservice.go     | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/api/proto/vas/proto/vas.go b/api/proto/vas/proto/vas.go
index c9622cd5..c7e66945 100644
--- a/api/proto/vas/proto/vas.go
+++ b/api/proto/vas/proto/vas.go
@@ -266,6 +266,7 @@ type ZoneRefundInfoResp struct {
 }
 
 type ZoneRefundInfoVo struct {
+	NikeName   string `json:"nike_name"`
 	RefundInfo *dbstruct.RefundInfo
 }
 
diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go
index b3c4f4e0..a648e384 100644
--- a/app/mix/service/logic/vas_zone.go
+++ b/app/mix/service/logic/vas_zone.go
@@ -1057,7 +1057,7 @@ func (v *Vas) ZoneRefundV2(ctx *gin.Context, req *vasproto.ZoneRefundReq) error
 
 	} else if timeInterval > 2*3600 && timeInterval <= 24*3600 {
 		// refundsStatus = dbstruct.Refunds_Awaiting
-		// 发送主播审核消息
+		// TODO:wxy, 发送主播审核消息
 
 	} else {
 		refundsStatus = dbstruct.RefundsProhibit
diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go
index 7a413a4f..b0e711b3 100644
--- a/app/mix/service/vasservice.go
+++ b/app/mix/service/vasservice.go
@@ -1020,11 +1020,19 @@ func (s *Service) ZoneRefundInfo(ctx *gin.Context, req *vasproto.ZoneRefundInfoR
 		logger.Error("ZoneRefundInfo fail, err: %v", err)
 		return
 	}
+	if refundInfo == nil {
+		logger.Error("ZoneRefundInfo fail, User refund information does not exist, err: %v", err)
+		return
+	}
 
-	if refundInfo != nil {
-		info = &vasproto.ZoneRefundInfoVo{
-			RefundInfo: refundInfo,
-		}
+	mids := make([]int64, 0)
+	mids = append(mids, refundInfo.Mid)
+	// 获取用户信息
+	acntMap, _ := _DefaultAccount.GetAccountMapByMids(ctx, mids)
+
+	info = &vasproto.ZoneRefundInfoVo{
+		NikeName:   acntMap[refundInfo.Mid].GetName(),
+		RefundInfo: refundInfo,
 	}
 
 	return