tijiao

entity/integral.go

@@ -83,6 +83,8 @@ type FlowJSON struct {
 	AppId          int    `xorm:"appId" form:"appId" json:"appId"`                            //剑鱼标识
 	OperationType  bool   `xorm:"operationType" form:"operationType" json:"operationType"`    //永久：true、时效：false
 	Sort           int    `xorm:"sort" form:"sort" json:"sort"`                               //操作类型1加-1减
+	Page           int    `xorm:"page" form:"page" json:"page"`                               //当前页数
+	PageSize       int    `xorm:"pageSize" form:"pageSize" json:"pageSize"`                   //每页数量
 }
 
 //到期积分查询
@@ -109,4 +111,4 @@ type GuardJSON struct {
 	PointType int    `xorm:"pointType" form:"pointType" json:"pointType"` //积分类型
 	EndDate   string `xorm:"endDate" form:"endDate" json:"endDate"`       //截止时间
 	AppId     int    `xorm:"appId" form:"appId" json:"appId"`             //剑鱼标识
-}
+}

rpc/internal/logic/integraldetailedchecklogic.go

@@ -28,11 +28,13 @@ func NewIntegralDetailedCheckLogic(ctx context.Context, svcCtx *svc.ServiceConte
 // 积分明细查询
 func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
-	dat := entity.ExpireJSON{}
+	dat := entity.FlowJSON{}
 	dat.UserId = in.UserId
 	dat.EndDate = "2021-03"
 	dat.AppId = 10000
-	data := integralService.IntegralDetailedCheck(dat)
-	fmt.Println(data)
+	dat.Page=1;
+	dat.PageSize=2;
+	data,count := integralService.IntegralDetailedCheck(dat)
+	fmt.Println(count,data)
 	return &integral.AddResp{}, nil
 }

service/integralService.go

@@ -427,19 +427,19 @@ func (service *IntegralService) IntegralBalanceCheckService(userId,appId string)
 }
 
 //按月查询积分使用情况
-func (service *IntegralService) IntegralDetailedCheck(data entity.ExpireJSON) []entity.FlowReq {
+func (service *IntegralService) IntegralDetailedCheck(data entity.FlowJSON) ([]entity.FlowReq,int64) {
 	orm := entity.Engine
-	var err error
 	flowReq := []entity.FlowReq{}
-	err = orm.Table("integral_flow").Alias("flow").
+	numb,err := orm.Table("integral_flow").Alias("flow").
 		Select("flow.*,pt.name").
 		Join("left", "point_type pt", "flow.pointType=pt.code").
 		Where("flow.userId = ? AND flow.appId = ? AND DATE_FORMAT(flow.createTime,'%Y-%m')=? ", data.UserId, data.AppId, data.EndDate).
 		Desc("flow.createTime").
-		Find(&flowReq)
+		Limit(data.PageSize, (data.Page-1)*data.PageSize).
+		FindAndCount(&flowReq)
 	if err != nil {
 		log.Println(err)
-		return nil
+		return nil,int64(0)
 	}
-	return flowReq
+	return flowReq,numb
 }