From 58c2692eb83f4b3b7d944da0238e45412df90f25 Mon Sep 17 00:00:00 2001
From: lwl0608 <lwl0608@foxmail.com>
Date: Tue, 23 Apr 2024 17:39:42 +0800
Subject: [PATCH 1/2] fix coin order

---
 app/mix/service/apiservice.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go
index 2524d2cd..da3862ad 100644
--- a/app/mix/service/apiservice.go
+++ b/app/mix/service/apiservice.go
@@ -1194,6 +1194,13 @@ func (s *Service) ApiGetStreamerExtListByMid(ctx *gin.Context, req *streamerprot
 	if unlockInfo != nil {
 		data.IsUnlockWechat = 1
 	}
+
+	// 微信解锁订单
+	cOrder, _ := _DefaultVas.GetCoinOrderById(ctx, unlockInfo.GetOrderId())
+	if cOrder != nil {
+		data.WechatOrderId = cOrder.GetID()
+		data.WechatOrderStatus = cOrder.GetOrderStatus()
+	}
 	return
 }
 

From 1966a42d281b8b67afaea824fa45cf38a29c599d Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Tue, 23 Apr 2024 18:30:28 +0800
Subject: [PATCH 2/2] by Robin at 20240422

---
 api/proto/zonemoment/proto/zonemoment_vo_api.go | 1 +
 app/mix/service/utilservice.go                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/proto/zonemoment/proto/zonemoment_vo_api.go b/api/proto/zonemoment/proto/zonemoment_vo_api.go
index 1c2ce17d..9f5afae6 100644
--- a/api/proto/zonemoment/proto/zonemoment_vo_api.go
+++ b/api/proto/zonemoment/proto/zonemoment_vo_api.go
@@ -16,6 +16,7 @@ type ApiZoneMomentVO struct {
 	Expenditure            int64                       `json:"expenditure"`
 	IronfanshipPrice       int64                       `json:"ironfanship_price"`
 	BuyerCnt               int64                       `json:"buyer_cnt"` // 动态购买人数
+	IsSuperfanshipEnabled  int64                       `json:"is_superfanship_enabled"`
 }
 
 func (vo *ApiZoneMomentVO) CopyZoneMoment(zonemoment *dbstruct.ZoneMoment) {
diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go
index 26ca30e1..6c4babb8 100644
--- a/app/mix/service/utilservice.go
+++ b/app/mix/service/utilservice.go
@@ -1722,6 +1722,7 @@ func (s *Service) utilFillZoneMomentsWithApiVOInfo(ctx *gin.Context, list []*dbs
 		// 铁粉价格
 		if zv, ok := zvMap[zid]; ok {
 			vo.IronfanshipPrice = zv.IronfanshipPrice
+			vo.IsSuperfanshipEnabled = int64(zv.IsSuperfanshipEnabled)
 		}
 	}