up

models/raspMinerTxs.go

@@ -14,6 +14,14 @@ type RaspMinerTxs struct {
 	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"`
+}
+
 // ExistByAddr checks if an addr exists based on addr
 func ExistByAddrHeight(addr string,height int64) (bool, error) {
 	var txs RaspMinerTxs
@@ -40,9 +48,13 @@ func GetMinerTxsTotal(addr string) (int64, error) {
 }
 
 // GetAddrs gets a list of articles based on paging constraints
-func GetMinerTxs(pageNum int32, pageSize int32, maps interface{}) ([]*RaspMinerTxs, error) {
+func GetMinerTxs(req *ReqTicketInfo) ([]*RaspMinerTxs, error) {
 	var txs []*RaspMinerTxs
-	err := db.Where(maps).Offset((pageNum-1)*pageSize).Limit(pageSize).Find(&txs).Error
+	if req.Order == "" {
+		req.Order = "desc"
+	}
+	maps := map[string]interface{}{"miner":req.Addr}
+	err := db.Where(maps).Order("time "+req.Order).Offset((req.Page-1)*req.Pagesize).Limit(req.Pagesize).Find(&txs).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
 	}

pkg/util/const.go

+package util
+
+var (
+	execAddr = map[string]string{
+		"16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp":"16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp",//ticket
+	}
+)

service/pai_service/pai.go

@@ -48,13 +48,6 @@ type MinedTxInfo struct {
 }
 
 
-type ReqTicketInfo struct {
-	Addr string `json:"addr" binding:"required"`
-	Page int32 `json:"page"`
-	Pagesize int32 `json:"pagesize"`
-	Detail bool `json:"detail"`
-}
-
 type ReqMineTime struct {
 	Addr string `json:"addr" binding:"required"`
 	Flag string `json:"flag"`
@@ -159,7 +152,7 @@ func getPaiConfig(command string ,arg ...string) (config map[string]string,err e
 	return list, nil
 }
 
-func (p *Pai) GetTicketInfo(req *ReqTicketInfo) (*MinedInfo,error) {
+func (p *Pai) GetTicketInfo(req *models.ReqTicketInfo) (*MinedInfo,error) {
 	var info MinedInfo
 	txsList := make([]*MinedTxInfo,0)
 	stat,err := models.GetAddr(req.Addr)
@@ -172,7 +165,7 @@ func (p *Pai) GetTicketInfo(req *ReqTicketInfo) (*MinedInfo,error) {
 		if err != nil {
 			logging.Error("models.GetMinerTxsCount err",err)
 		}
-		txs,err := models.GetMinerTxs(req.Page,req.Pagesize,map[string]interface{}{"miner":req.Addr})
+		txs,err := models.GetMinerTxs(req)
 		if err != nil {
 			logging.Error("models.GetAddrs err",err)
 			return nil,err