update

models/raspMinerTxs.go

@@ -23,9 +23,9 @@ type ReqTicketInfo struct {
 }
 
 // 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
 	}
@@ -69,7 +69,7 @@ func AddMinerTxs(data map[string]interface{}) error {
 		ReturnAddr: data["return_addr"].(string),
 		Amount:     data["amount"].(int64),
 		Height:     data["height"].(int64),
-		Hash:data["hash"].(string),
+		Hash:       data["hash"].(string),
 		Time:       data["time"].(int64),
 	}
 	if err := db.Create(&tx).Error; err != nil {
@@ -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