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

fix

Browse Source
This commit is contained in:
yangduo 2024-08-18 15:52:01 +08:00
parent 925758f7f5
commit 0b8f8f3961
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ func (cta *ContriApi) HistoryQuery(c *gin.Context) {
Rows []*info `json:"rows"` Rows []*info `json:"rows"`
}{} }{}
mycp, _ := service.Contribution.GetAddressContribution(account) mycp, _ := service.Contribution.GetAddressContribution(account, false)
rspObj.CP = fmt.Sprintf("%.2f", mycp) rspObj.CP = fmt.Sprintf("%.2f", mycp)
q5.NewSlice(&rspObj.Rows, 0, 10) q5.NewSlice(&rspObj.Rows, 0, 10)
@ -141,7 +141,7 @@ 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, false)
rspObj.CP = fmt.Sprintf("%.2f", mycp) rspObj.CP = fmt.Sprintf("%.2f", mycp)
rspObj.Info.MyCP = rspObj.CP rspObj.Info.MyCP = rspObj.CP
rspObj.Info.GCP = fmt.Sprintf("%.2f", totalgcp) rspObj.Info.GCP = fmt.Sprintf("%.2f", totalgcp)

6
server/marketserver/api/v1/recharge/recharge.go
View File

@ -35,7 +35,7 @@ func (ea *RechargeApi) RechargeList(c *gin.Context) {
return return
} }
if contribution, err := service.Contribution.GetAddressContribution(accountAddress); err != nil { if contribution, err := service.Contribution.GetAddressContribution(accountAddress, true); err != nil {
f5.RspErr(c, 2, "server internal error") f5.RspErr(c, 2, "server internal error")
return return
} else { } else {
@ -50,8 +50,8 @@ func (ea *RechargeApi) RechargeList(c *gin.Context) {
tmpmap["price"] = tb.GetPrice() tmpmap["price"] = tb.GetPrice()
tmpmap["max_buy_times"] = tb.GetMaxBuyTimes() tmpmap["max_buy_times"] = tb.GetMaxBuyTimes()
tmpmap["can_email_buy"] = tb.GetCanEmailBuy() tmpmap["can_email_buy"] = tb.GetCanEmailBuy()
currencyList := []struct{ currencyList := []struct {
Name string `json:"name"` Name string `json:"name"`
Address string `json:"address"` Address string `json:"address"`
}{} }{}
currencysMeta.Range( currencysMeta.Range(

2
server/marketserver/api/v1/user/user.go
View File

@ -26,7 +26,7 @@ func (this *UserApi) Info(c *gin.Context) {
Diamond string `json:"diamond"` Diamond string `json:"diamond"`
}{} }{}
rspObj.Email = c.MustGet("email").(string) rspObj.Email = c.MustGet("email").(string)
contributionPoint, _ := service.Contribution.GetAddressContribution(accountAddress) contributionPoint, _ := service.Contribution.GetAddressContribution(accountAddress, false)
var gold float64 var gold float64
var diamond float64 var diamond float64
{ {

20
server/marketserver/service/contribution.go
View File

@ -7,12 +7,13 @@ import (
) )
type accountContricution struct { type accountContricution struct {
history float64 history float64
loadhistory bool loadhistory bool
contribution float64 contribution float64
gcTime int64 rechargeContri float64
loweremail string gcTime int64
accountid string loweremail string
accountid string
} }
type contribution struct { type contribution struct {
@ -40,7 +41,7 @@ func (this *contribution) GetEmailAccountId(accountAddress string) (string, stri
return "", "" return "", ""
} }
func (this *contribution) GetAddressContribution(accountAddress string) (float64, error) { func (this *contribution) GetAddressContribution(accountAddress string, onlyrecharge bool) (float64, error) {
accinfo, exist := this.accountContricutionlist.Load(accountAddress) accinfo, exist := this.accountContricutionlist.Load(accountAddress)
var beforcontribution float64 = 0 var beforcontribution float64 = 0
if nowseconds := f5.GetApp().GetRealSeconds(); !exist || (*accinfo).gcTime+60 < nowseconds { if nowseconds := f5.GetApp().GetRealSeconds(); !exist || (*accinfo).gcTime+60 < nowseconds {
@ -158,6 +159,7 @@ func (this *contribution) GetAddressContribution(accountAddress string) (float64
if ds.Next() { if ds.Next() {
tmp, _ := q5.ToFloat64Ex(ds.GetByIndex(0)) tmp, _ := q5.ToFloat64Ex(ds.GetByIndex(0))
(*accinfo).contribution += tmp (*accinfo).contribution += tmp
(*accinfo).rechargeContri = tmp
} }
}) })
} }
@ -170,6 +172,10 @@ func (this *contribution) GetAddressContribution(accountAddress string) (float64
this.GetGlobalContribution(true) this.GetGlobalContribution(true)
} }
if onlyrecharge {
return (*accinfo).rechargeContri, nil
}
return (*accinfo).contribution, nil return (*accinfo).contribution, nil
} }