Merge pull request 'feat-IRONFANS-70' (#326) from feat-IRONFANS-70 into test

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/326

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) {

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
 }
 

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)
 		}
 	}