server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
yangduo 2024-08-17 18:32:36 +08:00
parent eff2547175
commit 8ae5aec135
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/marketserver/api/v1/activity/contribution.go
View File

@ -2,10 +2,10 @@ package activity
import ( import (
"f5" "f5"
"fmt"
"main/constant" "main/constant"
"main/service" "main/service"
"q5" "q5"
"sort"
"strings" "strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -31,14 +31,14 @@ func (cta *ContriApi) HistoryQuery(c *gin.Context) {
} }
rspObj := struct { rspObj := struct {
Errcode int32 `json:"errcode"` Errcode int32 `json:"errcode"`
Msg int32 `json:"errmsg"` Msg int32 `json:"errmsg"`
CP string `json:"contributionPoint"` CP string `json:"contributionPoint"`
Rows []info `json:"rows"` Rows []*info `json:"rows"`
}{} }{}
mycp, _ := service.Contribution.GetAddressContribution(account) mycp, _ := service.Contribution.GetAddressContribution(account)
rspObj.CP = q5.SafeToString(mycp) rspObj.CP = fmt.Sprintf("%.2f", mycp)
q5.NewSlice(&rspObj.Rows, 0, 10) q5.NewSlice(&rspObj.Rows, 0, 10)
if mycp > 0.000001 { if mycp > 0.000001 {
@ -53,10 +53,11 @@ func (cta *ContriApi) HistoryQuery(c *gin.Context) {
} }
for ds.Next() { for ds.Next() {
p := q5.NewSliceElement(&rspObj.Rows) p := new(info)
p.Type = 1 p.Type = 1
p.Time = q5.SafeToInt32(ds.GetByName("settle_date")) p.Time = q5.SafeToInt32(ds.GetByName("settle_date"))
p.CP = ds.GetByName("contribution") p.CP = fmt.Sprintf("%.2f", q5.ToFloat64(ds.GetByName("contribution")))
q5.AppendSlice(&rspObj.Rows, p)
} }
}) })
@ -73,10 +74,11 @@ func (cta *ContriApi) HistoryQuery(c *gin.Context) {
} }
for ds.Next() { for ds.Next() {
p := q5.NewSliceElement(&rspObj.Rows) p := new(info)
p.Type = 2 p.Type = 2
p.Time = q5.SafeToInt32(ds.GetByName("createtime")) p.Time = q5.SafeToInt32(ds.GetByName("createtime"))
p.CP = ds.GetByName("contribution") p.CP = fmt.Sprintf("%.2f", q5.ToFloat64(ds.GetByName("contribution")))
q5.AppendSlice(&rspObj.Rows, p)
} }
}) })
@ -97,17 +99,18 @@ func (cta *ContriApi) HistoryQuery(c *gin.Context) {
} }
for ds.Next() { for ds.Next() {
p := q5.NewSliceElement(&rspObj.Rows) p := new(info)
p.Type = 3 p.Type = 3
p.Time = q5.SafeToInt32(ds.GetByName("pay_time")) p.Time = q5.SafeToInt32(ds.GetByName("pay_time"))
p.CP = ds.GetByName("return_contribution") p.CP = fmt.Sprintf("%.2f", q5.ToFloat64(ds.GetByName("return_contribution")))
q5.AppendSlice(&rspObj.Rows, p)
} }
}) })
} }
} }
sort.Slice(rspObj.Rows, func(a int, b int) bool { q5.Sort(rspObj.Rows, func(a *info, b *info) bool {
return rspObj.Rows[a].Time > rspObj.Rows[b].Time return a.Time > b.Time
}) })
c.JSON(200, rspObj) c.JSON(200, rspObj)
@ -137,8 +140,8 @@ func (cta *ContriApi) CECQuery(c *gin.Context) {
totalgcp, _ := service.Contribution.GetGlobalContribution(false) totalgcp, _ := service.Contribution.GetGlobalContribution(false)
mycp, _ := service.Contribution.GetAddressContribution(account) mycp, _ := service.Contribution.GetAddressContribution(account)
rspObj.Info.MyCP = q5.ToString(mycp) rspObj.Info.MyCP = fmt.Sprintf("%.2f", mycp)
rspObj.Info.GCP = q5.ToString(totalgcp) rspObj.Info.GCP = fmt.Sprintf("%.2f", totalgcp)
rspObj.Info.GCEC = 500000 rspObj.Info.GCEC = 500000
rspObj.Info.MyCEC = q5.SafeToInt64(float64(rspObj.Info.GCEC) * (mycp) / totalgcp) rspObj.Info.MyCEC = q5.SafeToInt64(float64(rspObj.Info.GCEC) * (mycp) / totalgcp)