From c160b213ceff8579b201da0ac3d4350675d5b2a3 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Fri, 2 Aug 2024 17:43:57 +0800
Subject: [PATCH] diamond info

---
 .../marketserver/api/v1/activity/stacking.go  |  5 +-
 server/marketserver/api/v1/user/user.go       | 60 +++++++++++++------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/server/marketserver/api/v1/activity/stacking.go b/server/marketserver/api/v1/activity/stacking.go
index 4d327f9c..584cfbe2 100644
--- a/server/marketserver/api/v1/activity/stacking.go
+++ b/server/marketserver/api/v1/activity/stacking.go
@@ -135,13 +135,14 @@ func (sa *StackingApi) DiamondRecordQuery(c *gin.Context) {
 	}{}
 
 	{
-		sql := `SELECT * FROM t_diamond WHERE account_address = ? ORDER BY createtime DESC`
+		sql := `SELECT * FROM t_diamond_consume_product WHERE account_id = ? OR passport_address = ? ORDER BY createtime DESC`
 		params := []string{
 			accountAddress,
+			accountAddress,
 		}
 
 		f5.GetGoStyleDb().RawQuery(
-			constant.BCNFT_DB,
+			constant.GAME_DB,
 			sql,
 			params,
 			func(err error, ds *f5.DataSet) {
diff --git a/server/marketserver/api/v1/user/user.go b/server/marketserver/api/v1/user/user.go
index 5d804f8c..acce281a 100644
--- a/server/marketserver/api/v1/user/user.go
+++ b/server/marketserver/api/v1/user/user.go
@@ -1,47 +1,48 @@
 package user
 
 import (
-	"q5"
 	"f5"
-	"main/constant"
-	"strings"
-	"github.com/gin-gonic/gin"
 	"fmt"
+	"main/constant"
+	"q5"
+	"strings"
+
+	"github.com/gin-gonic/gin"
 )
 
 type UserApi struct {
-
 }
 
 func (this *UserApi) Info(c *gin.Context) {
 	accountAddress := strings.ToLower(c.Param("account_address"))
 	rspObj := struct {
-		ErrCode int32 `json:"errcode"`
-		ErrMsg string `json:"errmsg"`
-		NickName string `json:"nickname"`
-		Email string `json:"email"`
+		ErrCode           int32  `json:"errcode"`
+		ErrMsg            string `json:"errmsg"`
+		NickName          string `json:"nickname"`
+		Email             string `json:"email"`
 		ContributionPoint string `json:"contribution_point"`
-		Gold string `json:"gold"`
-		Diamond string `json:"diamond"`
-	}{
-	}
+		Gold              string `json:"gold"`
+		Diamond           string `json:"diamond"`
+	}{}
 	var contributionPoint float64
 	var gold float64
+	var diamond float64
 	{
 		var dbErr error
 		f5.GetGoStyleDb().OrmSelectOne(
 			constant.GAME_DB,
 			"t_user",
 			[][]string{
-				{"address", accountAddress},
+				{"account_id", accountAddress},
 			},
-			func (err error, ds *f5.DataSet) {
+			func(err error, ds *f5.DataSet) {
 				dbErr = err
 				if err != nil {
 					return
 				}
 				if ds.Next() {
 					gold = q5.ToFloat64(ds.GetByName("gold"))
+					diamond = q5.ToFloat64(ds.GetByName("diamond"))
 				}
 			})
 		if dbErr != nil {
@@ -57,7 +58,7 @@ func (this *UserApi) Info(c *gin.Context) {
 			[][]string{
 				{"account_address", accountAddress},
 			},
-			func (err error, ds *f5.DataSet) {
+			func(err error, ds *f5.DataSet) {
 				dbErr = err
 				if err != nil {
 					return
@@ -81,7 +82,7 @@ func (this *UserApi) Info(c *gin.Context) {
 			constant.BCNFT_DB,
 			sql,
 			params,
-			func (err error, ds *f5.DataSet) {
+			func(err error, ds *f5.DataSet) {
 				dbErr = err
 				if err != nil {
 					return
@@ -95,7 +96,32 @@ func (this *UserApi) Info(c *gin.Context) {
 			return
 		}
 	}
+	{
+		var dbErr error
+		sql := "SELECT SUM(diamond) FROM t_recharge WHERE passport = ?"
+		params := []string{
+			accountAddress,
+		}
+		f5.GetGoStyleDb().RawQuery(
+			constant.BCEVENT_DB,
+			sql,
+			params,
+			func(err error, ds *f5.DataSet) {
+				dbErr = err
+				if err != nil {
+					return
+				}
+				for ds.Next() {
+					diamond += q5.ToFloat64(ds.GetByIndex(0))
+				}
+			})
+		if dbErr != nil {
+			f5.RspErr(c, 500, "server internal error")
+			return
+		}
+	}
 	rspObj.ContributionPoint = fmt.Sprintf("%.2f", contributionPoint)
 	rspObj.Gold = fmt.Sprintf("%.2f", gold)
+	rspObj.Diamond = fmt.Sprintf("%.2f", diamond)
 	c.JSON(200, rspObj)
 }