wip:查询全部资源信息

api/integral.api

@@ -65,7 +65,7 @@ type recordReq {
 	Page         int64  `form:"page,optional"`
 	PageSize     int64  `form:"pageSize,optional"`
 	ResourceType string `form:"resourceType,optional"` //资源类型
-	State        int64  `form:"state,optional"`        //0查消耗记录 1 查充值记录 2 新增 作废
+	State        int64  `form:"state,optional"`        //0查消耗记录 1 查充值记录 2 新增 作废 -1查询全部
 	QueryTime    string `form:"queryTime,optional"`    //查询时间
 }
 
@@ -134,4 +134,4 @@ service integral-api {
 	@handler UpdateVipTimeHandler // TODO: set handler name and delete this comment
 	post /resources/updateVipTime (vipReq) returns(resourcesRes)
 
-}
+}

service/resourceManageService.go

@@ -161,6 +161,16 @@ func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.Reco
 				Where("accountId = ? and userType>0 and   resourceType like ? ", in.AccountId, "%"+in.ResourceType+"%").
 				Limit(int(in.PageSize), (int(in.Page)-1)*int(in.PageSize)).OrderBy("id desc").FindAndCount(&recordArr)
 		}
+	case -1:
+		if in.QueryTime != "" {
+			count, err = orm.Table("consume_record").
+				Where("accountId = ? and   resourceType like ? and DATE_FORMAT( createTime, '%Y-%m' ) = ?", in.AccountId, "%"+in.ResourceType+"%", in.QueryTime).
+				Limit(int(in.PageSize), (int(in.Page)-1)*int(in.PageSize)).OrderBy("id desc").FindAndCount(&recordArr)
+		} else {
+			count, err = orm.Table("consume_record").
+				Where("accountId = ? and   resourceType like ? ", in.AccountId, "%"+in.ResourceType+"%").
+				Limit(int(in.PageSize), (int(in.Page)-1)*int(in.PageSize)).OrderBy("id desc").FindAndCount(&recordArr)
+		}
 	}
 	if err != nil && count == 0 {
 		return dataList, 0, err