|
@@ -2,7 +2,6 @@ package controller
|
|
|
|
|
|
import (
|
|
|
"fmt"
|
|
|
- "ktogame/dbUtil"
|
|
|
"ktogame/models"
|
|
|
"strings"
|
|
|
|
|
@@ -11,7 +10,7 @@ import (
|
|
|
"github.com/go-xorm/xorm"
|
|
|
)
|
|
|
|
|
|
-func UpdateSuperiorsPerformance(engine *xorm.Engine, superiorsStr string, amount float64) error {
|
|
|
+func UpdateSuperiorsPerformance(engine *xorm.Session, superiorsStr string, amount float64) error {
|
|
|
logs.Info("into UpdateSuperiorsPerformance:", superiorsStr, amount)
|
|
|
ids := strings.Split(superiorsStr, ",")
|
|
|
if len(ids) <= 0 {
|
|
@@ -36,14 +35,14 @@ func UpdateSuperiorsPerformance(engine *xorm.Engine, superiorsStr string, amount
|
|
|
}
|
|
|
|
|
|
var rp models.RewardsPool
|
|
|
- _, err := engine.Id(1).Get(&rp)
|
|
|
+ _, err := engine.ID(1).Get(&rp)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
for _, super := range supers {
|
|
|
var per models.Performance
|
|
|
- ok, err := engine.Id(super.Addr).Get(&per)
|
|
|
+ ok, err := engine.ID(super.Addr).Get(&per)
|
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
|
continue
|
|
@@ -56,7 +55,7 @@ func UpdateSuperiorsPerformance(engine *xorm.Engine, superiorsStr string, amount
|
|
|
per.TotalPerformance += amount
|
|
|
if per.TotalPerformance >= float64(CommunityMarket) {
|
|
|
var super models.Performance
|
|
|
- ok, err := engine.Id(per.Addr).Get(&super)
|
|
|
+ ok, err := engine.ID(per.Addr).Get(&super)
|
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
|
continue
|
|
@@ -94,7 +93,7 @@ func UpdateSuperiorsPerformance(engine *xorm.Engine, superiorsStr string, amount
|
|
|
//update available
|
|
|
logs.Debug("Performance check=====2,", per.Addr, level, amount, ratio, rewards)
|
|
|
|
|
|
- err := UpdateAvailableRewards(rewards, super.Addr, false, false)
|
|
|
+ err := UpdateAvailableRewards(engine, rewards, super.Addr, false, false)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -113,14 +112,14 @@ func UpdateSuperiorsPerformance(engine *xorm.Engine, superiorsStr string, amount
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- logs.Info("into UpdateSuperiorsPerformance end:", rp)
|
|
|
+ logs.Info("UpdateSuperiorsPerformance end:", rp)
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func UpdateRewardsPool(engine *xorm.Engine, amount float64) error {
|
|
|
+func UpdateRewardsPool(engine *xorm.Session, amount float64) error {
|
|
|
logs.Info("into UpdateRewardsPool:", amount)
|
|
|
var rp models.RewardsPool
|
|
|
- _, err := dbUtil.Engine.Id(1).Get(&rp)
|
|
|
+ _, err := engine.ID(1).Get(&rp)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -136,12 +135,12 @@ func UpdateRewardsPool(engine *xorm.Engine, amount float64) error {
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func UpdateAvailableRewards(rewards float64, uaddr string, join, isdirect bool) error {
|
|
|
+func UpdateAvailableRewards(engine *xorm.Session, rewards float64, uaddr string, join, isdirect bool) error {
|
|
|
logs.Info("into UpdateAvailableRewards:", rewards, uaddr, join, isdirect)
|
|
|
a_rewards := rewards * 60 / 100
|
|
|
a_reinput := rewards * 40 / 100
|
|
|
var user models.UserInfo
|
|
|
- ok, err := dbUtil.Engine.Id(uaddr).Get(&user)
|
|
|
+ ok, err := engine.ID(uaddr).Get(&user)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -156,7 +155,7 @@ func UpdateAvailableRewards(rewards float64, uaddr string, join, isdirect bool)
|
|
|
user.DirectNumber += 1
|
|
|
user.DirectRewards += rewards
|
|
|
logs.Info("check direct info=====:", rewards, a_rewards, a_reinput, user.AvailableClaim, user.AvailableReinput, user.DirectNumber, user.DirectRewards)
|
|
|
- _, err := dbUtil.Engine.ID(user.Addr).Cols("available_claim,available_reinput,direct_number,direct_rewards").Update(&user)
|
|
|
+ _, err := engine.ID(user.Addr).Cols("available_claim,available_reinput,direct_number,direct_rewards").Update(&user)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -164,26 +163,26 @@ func UpdateAvailableRewards(rewards float64, uaddr string, join, isdirect bool)
|
|
|
user.IndirectNumber += 1
|
|
|
user.IndirectRewards += rewards
|
|
|
logs.Info("check indirect info=====:", rewards, a_rewards, a_reinput, user.AvailableClaim, user.AvailableReinput, user.DirectNumber, user.DirectRewards)
|
|
|
- _, err := dbUtil.Engine.ID(user.Addr).Cols("available_claim,available_reinput,indirect_number,indirect_rewards").Update(&user)
|
|
|
+ _, err := engine.ID(user.Addr).Cols("available_claim,available_reinput,indirect_number,indirect_rewards").Update(&user)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
logs.Info("check else info=====:", user.AvailableClaim, user.AvailableReinput)
|
|
|
- _, err := dbUtil.Engine.ID(user.Addr).Cols("available_claim,available_reinput").Update(&user)
|
|
|
+ _, err := engine.ID(user.Addr).Cols("available_claim,available_reinput").Update(&user)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
}
|
|
|
- logs.Info("into UpdateAvailableRewards end:", user)
|
|
|
+ logs.Info("UpdateAvailableRewards end:", user)
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func UpdateCommunityGift(engine *xorm.Engine, amount float64, uaddr string) error {
|
|
|
+func UpdateCommunityGift(engine *xorm.Session, amount float64, uaddr string) error {
|
|
|
logs.Info("into UpdateCommunityGift:", amount, uaddr)
|
|
|
var user, tmpUser models.UserInfo
|
|
|
- ok, err := engine.Id(uaddr).Get(&user)
|
|
|
+ ok, err := engine.ID(uaddr).Get(&user)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -213,13 +212,13 @@ func UpdateCommunityGift(engine *xorm.Engine, amount float64, uaddr string) erro
|
|
|
}
|
|
|
|
|
|
rewards := amount * (float64(leftNum+rightNum) / 100)
|
|
|
- err = UpdateAvailableRewards(rewards, user.Addr, false, false)
|
|
|
+ err = UpdateAvailableRewards(engine, rewards, user.Addr, false, false)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
var per models.Performance
|
|
|
- ok, err = engine.Id(uaddr).Get(&per)
|
|
|
+ ok, err = engine.ID(uaddr).Get(&per)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -231,11 +230,11 @@ func UpdateCommunityGift(engine *xorm.Engine, amount float64, uaddr string) erro
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- logs.Info("into UpdateCommunityGift end:", amount, uaddr)
|
|
|
+ logs.Info("UpdateCommunityGift end:", amount, uaddr)
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func UpdateCommunityNodes(engine *xorm.Engine, amount float64) error {
|
|
|
+func UpdateCommunityNodes(engine *xorm.Session, amount float64) error {
|
|
|
logs.Info("into UpdateCommunityNodes:", amount)
|
|
|
var nodes []models.UserInfo
|
|
|
err := engine.Where("state = ?", CommunityUsers).Find(&nodes)
|
|
@@ -247,14 +246,14 @@ func UpdateCommunityNodes(engine *xorm.Engine, amount float64) error {
|
|
|
}
|
|
|
rewards := (amount * 5 / 100) / float64(len(nodes))
|
|
|
for _, node := range nodes {
|
|
|
- err = UpdateAvailableRewards(rewards, node.Addr, false, false)
|
|
|
+ err = UpdateAvailableRewards(engine, rewards, node.Addr, false, false)
|
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
var per models.Performance
|
|
|
- _, err = engine.Id(node.Addr).Get(&per)
|
|
|
+ _, err = engine.ID(node.Addr).Get(&per)
|
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
|
continue
|
|
@@ -267,11 +266,11 @@ func UpdateCommunityNodes(engine *xorm.Engine, amount float64) error {
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
- logs.Info("into UpdateCommunityNodes end:", amount)
|
|
|
+ logs.Info("UpdateCommunityNodes end:", amount)
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func UpdateMarket(engine *xorm.Engine, amount float64) error {
|
|
|
+func UpdateMarket(engine *xorm.Session, amount float64) error {
|
|
|
logs.Info("into UpdateMarket:", amount)
|
|
|
var pers []models.Performance
|
|
|
err := engine.Where("market_num >= ?", 2).Find(&pers)
|
|
@@ -279,7 +278,7 @@ func UpdateMarket(engine *xorm.Engine, amount float64) error {
|
|
|
return err
|
|
|
}
|
|
|
var rp models.RewardsPool
|
|
|
- ok, err := engine.Id(1).Get(&rp)
|
|
|
+ ok, err := engine.ID(1).Get(&rp)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -308,7 +307,7 @@ func UpdateMarket(engine *xorm.Engine, amount float64) error {
|
|
|
//update available
|
|
|
logs.Debug(" UpdateMarket=====2,", per.Addr, rewards)
|
|
|
|
|
|
- err := UpdateAvailableRewards(rewards, per.Addr, false, false)
|
|
|
+ err := UpdateAvailableRewards(engine, rewards, per.Addr, false, false)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -326,6 +325,6 @@ func UpdateMarket(engine *xorm.Engine, amount float64) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- logs.Info("into UpdateMarket end:", amount)
|
|
|
+ logs.Info("UpdateMarket end:", amount)
|
|
|
return nil
|
|
|
}
|