update

models/raspMinerTxs.go

@@ -6,26 +6,26 @@ import (
 
 type RaspMinerTxs struct {
 	//Model
-	Miner   string `json:"miner";gorm:"INDEX"`
+	Miner      string `json:"miner";gorm:"INDEX"`
 	ReturnAddr string `json:"return_addr"`
-	Amount int64 `json:"amount"`
-	Height int64 `json:"height"`
-	Hash string `json:"hash"`
-	Time int64 `json:"time"`
+	Amount     int64  `json:"amount"`
+	Height     int64  `json:"height"`
+	Hash       string `json:"hash"`
+	Time       int64  `json:"time"`
 }
 
 type ReqTicketInfo struct {
-	Addr string `json:"addr" binding:"required"`
-	Page int32 `json:"page"`
-	Pagesize int32 `json:"pagesize"`
-	Detail bool `json:"detail"`
-	Order string `json:"order"`
+	Addr     string `json:"addr" binding:"required"`
+	Page     int32  `json:"page"`
+	Pagesize int32  `json:"pagesize"`
+	Detail   bool   `json:"detail"`
+	Order    string `json:"order"`
 }
 
 // ExistByAddr checks if an addr exists based on addr
-func ExistByAddrHeight(addr string,height int64) (bool, error) {
+func ExistByAddrHeight(addr string, height int64) (bool, error) {
 	var txs RaspMinerTxs
-	err := db.Select("miner").Where("miner = ? and height = ?", addr,height).First(&txs).Error
+	err := db.Select("miner").Where("miner = ? and height = ?", addr, height).First(&txs).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return false, err
 	}
@@ -40,7 +40,7 @@ func ExistByAddrHeight(addr string,height int64) (bool, error) {
 // GetAddrTotal gets the total number of addr based on the constraints
 func GetMinerTxsTotal(addr string) (int64, error) {
 	var count int64
-	if err := db.Model(&RaspMinerTxs{}).Where("return_addr = ? ",addr).Count(&count).Error; err != nil {
+	if err := db.Model(&RaspMinerTxs{}).Where("return_addr = ? ", addr).Count(&count).Error; err != nil {
 		return 0, err
 	}
 
@@ -53,8 +53,8 @@ func GetMinerTxs(req *ReqTicketInfo) ([]*RaspMinerTxs, error) {
 	if req.Order == "" {
 		req.Order = "desc"
 	}
-	maps := map[string]interface{}{"return_addr":req.Addr}
-	err := db.Where(maps).Order("time "+req.Order).Offset((req.Page-1)*req.Pagesize).Limit(req.Pagesize).Find(&txs).Error
+	maps := map[string]interface{}{"return_addr": req.Addr}
+	err := db.Where(maps).Order("height " + req.Order).Offset((req.Page - 1) * req.Pagesize).Limit(req.Pagesize).Find(&txs).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -65,12 +65,12 @@ func GetMinerTxs(req *ReqTicketInfo) ([]*RaspMinerTxs, error) {
 // AddAddr add a single addr
 func AddMinerTxs(data map[string]interface{}) error {
 	tx := RaspMinerTxs{
-		Miner:         data["addr"].(string),
+		Miner:      data["addr"].(string),
 		ReturnAddr: data["return_addr"].(string),
-		Amount:	data["amount"].(int64),
-		Height:			data["height"].(int64),
-		Hash:data["hash"].(string),
-		Time: data["time"].(int64),
+		Amount:     data["amount"].(int64),
+		Height:     data["height"].(int64),
+		Hash:       data["hash"].(string),
+		Time:       data["time"].(int64),
 	}
 	if err := db.Create(&tx).Error; err != nil {
 		return err
@@ -78,4 +78,3 @@ func AddMinerTxs(data map[string]interface{}) error {
 
 	return nil
 }
-

service/pai_service/pai.go

@@ -185,14 +185,14 @@ func (p *Pai) GetTicketInfo(req *models.ReqTicketInfo) (*MinedInfo, error) {
 		for _, v := range txs {
 			var t MinedTxInfo
 			t.Height = v.Height
-			t.Amount = v.Amount
+			t.Amount = v.Amount / 1e8
 			t.BlockTime = v.Time
 			t.Hash = v.Hash
 			txsList = append(txsList, &t)
 		}
 		//		info.MinedTotal = count
 	}
-	info.MinedAmount = stat.MinedAmount
+	info.MinedAmount = stat.MinedAmount / 1e8
 	info.MinedTicketCount = stat.MinedTicketCount
 	info.MiningTicketCount = stat.MiningTicketCount
 	info.MinerStartTime = stat.MinerStartTime