Merge pull request #1387 from irisnet/develop

R4R: add icon for goz test net explorer

Author: zhangjinbiao746

backend/orm/document/static_rewards.go

@@ -6,6 +6,7 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	"gopkg.in/mgo.v2/txn"
 	"time"
+	"github.com/irisnet/explorer/backend/utils"
 )
 
 const (
@@ -16,14 +17,14 @@ const (
 )
 
 type ExStaticRewards struct {
-	Id      bson.ObjectId `bson:"_id"`
-	Address string        `bson:"address"`
-	Date    time.Time     `bson:"date"`
-	Total   []Rewards     `bson:"total"`
-	//DelegationsDetail []DelegationsRewards `bson:"delegations_detail"`
-	Delegations []Rewards `bson:"delegations"`
-	Commission  []Rewards `bson:"commission"`
-	CreateAt    int64     `bson:"create_at"`
+	Id                 bson.ObjectId `bson:"_id"`
+	Address            string        `bson:"address"`
+	Date               time.Time     `bson:"date"`
+	Total              []Rewards     `bson:"total"`
+	Delegation         utils.Coin    `bson:"delegation"`
+	DelegationsRewards []Rewards     `bson:"delegations_rewards"`
+	Commission         []Rewards     `bson:"commission"`
+	CreateAt           int64         `bson:"create_at"`
 }
 
 type Rewards struct {

backend/task/static_rewards.go

@@ -50,19 +50,19 @@ func (task StaticRewardsTask) getRewardsFromLcd(address string) (utils.CoinsAsSt
 
 func (task StaticRewardsTask) getAllAccountRewards() ([]txn.Op, error) {
 
-	accAddrs, err := task.getAccountFromDb()
+	accs, err := task.getAccountFromDb()
 	if err != nil {
 		return nil, err
 	}
 
-	return task.saveExStaticRewardsOps(accAddrs)
+	return task.saveExStaticRewardsOps(accs)
 }
 
-func (task StaticRewardsTask) saveExStaticRewardsOps(accAddrs []string) ([]txn.Op, error) {
+func (task StaticRewardsTask) saveExStaticRewardsOps(accs []document.Account) ([]txn.Op, error) {
 	today := utils.TruncateTime(time.Now().In(cstZone), utils.Day)
-	ops := make([]txn.Op, 0, len(accAddrs))
+	ops := make([]txn.Op, 0, len(accs))
 	now := time.Now().Unix()
-	for _, addr := range accAddrs {
+	for _, addr := range accs {
 		item, err := task.loadModelRewards(addr, today)
 		item.CreateAt = now
 		if err != nil {
@@ -78,26 +78,27 @@ func (task StaticRewardsTask) saveExStaticRewardsOps(accAddrs []string) ([]txn.O
 	return ops, nil
 }
 
-func (task StaticRewardsTask) loadModelRewards(addr string, today time.Time) (document.ExStaticRewards, error) {
-	commisstionRds, _, totalRds, err := task.getRewardsFromLcd(addr)
+func (task StaticRewardsTask) loadModelRewards(account document.Account, today time.Time) (document.ExStaticRewards, error) {
+	commisstionRds, _, totalRds, err := task.getRewardsFromLcd(account.Address)
 	if err != nil {
 		logger.Warn(err.Error())
 		return document.ExStaticRewards{}, err
 	}
 
 	item := document.ExStaticRewards{
 		Id:         bson.NewObjectId(),
-		Address:    addr,
+		Address:    account.Address,
 		Date:       today.In(cstZone),
 		Total:      task.loadRewards(totalRds),
 		Commission: task.loadRewards(commisstionRds),
+		Delegation: account.Delegation,
 		//DelegationsDetail: task.loadDelegationsRewardsDetail(delegationsRds),
 	}
 	if len(item.Total) > 0 {
 		if len(item.Commission) == 0 {
-			item.Delegations = item.Total
+			item.DelegationsRewards = item.Total
 		} else {
-			item.Delegations = task.loadDelegationsRewards(item.Total[0], item.Commission[0])
+			item.DelegationsRewards = task.loadDelegationsRewards(item.Total[0], item.Commission[0])
 		}
 	}
 	return item, nil
@@ -162,40 +163,34 @@ func (task StaticRewardsTask) loadDelegationsRewards(total, commission document.
 		return nil
 	}
 
-	var ret []document.Rewards
-	subValueFloat64, ok := subValue.Float64()
-	if ok {
-		one := document.Rewards{
-			Iris:     subValueFloat64,
-			IrisAtto: subValue.String(),
-		}
-		ret = []document.Rewards{one}
+
+	subValueFloat64, _ := subValue.Float64()
+	one := document.Rewards{
+		Iris:     subValueFloat64 / math.Pow10(18),
+		IrisAtto: subValue.FloatString(0),
 	}
 
-	return ret
+	return []document.Rewards{one}
 }
 
-func (task StaticRewardsTask) getAccountFromDb() ([]string, error) {
+func (task StaticRewardsTask) getAccountFromDb() ([]document.Account, error) {
 	size := 100
 	offset := 0
 	length := size
-	var accAddress []string
+	var ret []document.Account
 	for {
 		accounts, err := task.account.GetDelegatores(offset, size)
 		if err != nil {
 			logger.Error(err.Error())
-			return accAddress, err
-		}
-
-		for _, val := range accounts {
-			accAddress = append(accAddress, val.Address)
+			return accounts, err
 		}
+		ret = append(ret, accounts...)
 		length = len(accounts)
 		if length < size {
 			break
 		}
 		offset += length
 	}
 
-	return accAddress, nil
+	return ret, nil
 }

frontend/icon/iconfont.css

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "14183675",
+      "name": "GOZ",
+      "font_class": "GOZ",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "13982898",
+      "name": "缺省默认头像",
+      "font_class": "queshengmorentouxiang",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
     {
       "icon_id": "13851059",
       "name": "展开",