From 2177fdadbb0152e74a24e8b96b1b292a9d949896 Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Tue, 16 Apr 2024 19:39:51 +0800
Subject: [PATCH] zv fix

---
 app/mix/service/vasservice.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/mix/service/vasservice.go b/app/mix/service/vasservice.go
index 0ebdbe2c..7455e8b3 100644
--- a/app/mix/service/vasservice.go
+++ b/app/mix/service/vasservice.go
@@ -681,19 +681,25 @@ func (s *Service) ZoneGetCashier(ctx *gin.Context, req *vasproto.ZoneGetCashierR
 		}
 	case dbstruct.ProductIdH5ZoneAdmission:
 		data.Name = "空间会员"
-		if zv != nil {
-			data.Price = zv.AdmissionPrice
+		if zv == nil {
+			ec = errcode.ErrCodeVasSrvFail
+			return nil, ec, fmt.Errorf("该主播未设置空间价格")
 		}
+		data.Price = zv.AdmissionPrice
 	case dbstruct.ProductIdH5ZoneIronfanship:
 		data.Name = "铁粉"
-		if zv != nil {
-			data.Price = zv.IronfanshipPrice
+		if zv == nil {
+			ec = errcode.ErrCodeVasSrvFail
+			return nil, ec, fmt.Errorf("该主播未设置空间价格")
 		}
+		data.Price = zv.AdmissionPrice
 	case dbstruct.ProductIdH5ZoneSuperfanship:
 		data.Name = "超粉"
-		if zv != nil {
-			data.Price = zv.SuperfanshipPrice
+		if zv == nil {
+			ec = errcode.ErrCodeVasSrvFail
+			return nil, ec, fmt.Errorf("该主播未设置空间价格")
 		}
+		data.Price = zv.AdmissionPrice
 		data.Validity = zv.GetSuperfanshipDurationDesc()
 	}
 	return