提交

entity/resources.go

@@ -10,20 +10,20 @@ type ResourcesAuth struct {
 }
 
 type AccountBalance struct {
-	Id         int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	EmployeeId int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"` //人员标识
-	Name       string `xorm:"name" form:"name" json:"name"`                   //资源名称
-	Number     int64  `xorm:"number" form:"number" json:"number"`             //余额
-	Code       string `xorm:"code" form:"code" json:"code"`                   //资源代码
-	Spec       string `xorm:"spec" form:"spec" json:"spec"`                   //规格
+	Id           int64  `xorm:"pk autoincr id" form:"id" json:"id"`
+	EmployeeId   int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"`       //人员标识
+	Name         string `xorm:"name" form:"name" json:"name"`                         //资源名称
+	Number       int64  `xorm:"number" form:"number" json:"number"`                   //余额
+	ResourceType string `xorm:"resourceType" form:"resourceType" json:"resourceType"` //资源代码
+	Spec         string `xorm:"spec" form:"spec" json:"spec"`                         //规格
 }
 
 type ConsumeRecord struct {
 	Id            int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	EmployeeId    int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"`       //人员标识; //用户标识
-	CompanyId     int64  `xorm:"companyId" form:"companyId" json:"companyId"`          //用户标识
-	ResourceType  string `xorm:"resourceType" form:"resourceType" json:"resourceType"` //资源类型
-	ExportNum     int64  `xorm:"exportNum" form:"exportNum" json:"exportNum"`//导出数量
+	EmployeeId    int64  `xorm:"employeeId" form:"employeeId" json:"employeeId"`          //人员标识; //用户标识
+	CompanyId     int64  `xorm:"companyId" form:"companyId" json:"companyId"`             //用户标识
+	ResourceType  string `xorm:"resourceType" form:"resourceType" json:"resourceType"`    //资源类型
+	ExportNum     int64  `xorm:"exportNum" form:"exportNum" json:"exportNum"`             //导出数量
 	DeductionType int64  `xorm:"deductionType" form:"deductionType" json:"deductionType"` //扣费类型(1高级字段包)
 	RuleId        int64  `xorm:"ruleId" form:"ruleId" json:"ruleId"`
 	ExportTime    string `xorm:"exportTime" form:"exportTime" json:"exportTime"`

rpc/etc/resourcescenter.yaml

@@ -13,7 +13,7 @@ Etcd:
   Hosts:
     - 127.0.0.1:2379
   Key: resourcescenter.rpc
-DataSource: root:Topnet123@tcp(127.0.0.1:13306)/jy_user_center?charset=utf8mb4&parseTime=true&loc=Local
+DataSource: root:Topnet123@tcp(127.0.0.1:3366)/jy_user_center?charset=utf8mb4&parseTime=true&loc=Local
 FileSystemConf:
   Etcd:
     Hosts:

rpc/internal/logic/findaccountbalancelogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"errors"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
@@ -23,19 +24,29 @@ func NewFindAccountBalanceLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 	}
 }
 
-func (l *FindAccountBalanceLogic) FindAccountBalance(in *resourcesCenter.AccountBalanceReq) (*resourcesCenter.AccountBalanceRes, error) {
+func (l *FindAccountBalanceLogic) FindAccountBalance(in *resourcesCenter.ResourcesReq) (*resourcesCenter.AccountBalanceRes, error) {
 	// todo: add your logic here and delete this line
-	dataList, err := resourceManageService.FindAccountBalance(in)
-	if len(dataList) == 0 && err != nil {
+	if in.AccountId != 0 {
+		dataList, err := resourceManageService.FindAccountBalance(in)
+
+		if len(dataList) == 0 && err != nil {
+			return &resourcesCenter.AccountBalanceRes{
+				Code:    0,
+				Message: "查询出错",
+				Data:    dataList,
+			}, err
+		}
 		return &resourcesCenter.AccountBalanceRes{
-			Code:    0,
-			Message: "查询出错",
+			Code:    1,
+			Message: "查询成功",
 			Data:    dataList,
-		}, err
+		}, nil
+	} else {
+		return &resourcesCenter.AccountBalanceRes{
+			Code:    0,
+			Message: "缺少参数",
+			Data:    nil,
+		}, errors.New("缺少参数")
 	}
-	return &resourcesCenter.AccountBalanceRes{
-		Code:    1,
-		Message: "查询成功",
-		Data:    dataList,
-	}, nil
+
 }

rpc/internal/logic/findconsumerecordlogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"errors"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
@@ -23,19 +24,28 @@ func NewFindConsumeRecordLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 	}
 }
 
-func (l *FindConsumeRecordLogic) FindConsumeRecord(in *resourcesCenter.ConsumeRecordReq) (*resourcesCenter.ConsumeRecordRes, error) {
+func (l *FindConsumeRecordLogic) FindConsumeRecord(in *resourcesCenter.ResourcesReq) (*resourcesCenter.ConsumeRecordRes, error) {
 	// todo: add your logic here and delete this line
-	recordArr, err := resourceManageService.FindConsumeRecord(in)
-	if len(recordArr) == 0 && err != nil {
+	if in.AccountId != 0 {
+		recordArr, err := resourceManageService.FindConsumeRecord(in)
+		if len(recordArr) == 0 && err != nil {
+			return &resourcesCenter.ConsumeRecordRes{
+				Code:    0,
+				Message: "查询出错",
+				Data:    recordArr,
+			}, err
+		}
 		return &resourcesCenter.ConsumeRecordRes{
-			Code:    0,
-			Message: "查询出错",
+			Code:    1,
+			Message: "查询成功",
 			Data:    recordArr,
-		}, err
+		}, nil
+	} else {
+		return &resourcesCenter.ConsumeRecordRes{
+			Code:    0,
+			Message: "缺少参数",
+			Data:    nil,
+		}, errors.New("缺少参数")
 	}
-	return &resourcesCenter.ConsumeRecordRes{
-		Code:    1,
-		Message: "查询成功",
-		Data:    recordArr,
-	}, nil
+
 }

rpc/internal/logic/findresourcesauthlogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"app.yhyue.com/moapp/jyResourcesCenter/service"
 	"context"
+	"errors"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
@@ -26,19 +27,27 @@ func NewFindResourcesAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 	}
 }
 
-func (l *FindResourcesAuthLogic) FindResourcesAuth(in *resourcesCenter.ResourcesAuthReq) (*resourcesCenter.ResourcesAuthRes, error) {
+func (l *FindResourcesAuthLogic) FindResourcesAuth(in *resourcesCenter.ResourcesReq) (*resourcesCenter.ResourcesAuthRes, error) {
 	// todo: add your logic here and delete this line
-	authArr, err := resourceManageService.FindResourcesAuth(in)
-	if len(authArr) == 0 && err != nil {
+	if in.AccountId != 0 {
+		authArr, err := resourceManageService.FindResourcesAuth(in)
+		if len(authArr) == 0 && err != nil {
+			return &resourcesCenter.ResourcesAuthRes{
+				Code:    0,
+				Message: "查询出错",
+				Data:    authArr,
+			}, err
+		}
 		return &resourcesCenter.ResourcesAuthRes{
-			Code:    0,
-			Message: "查询出错",
+			Code:    1,
+			Message: "查询成功",
 			Data:    authArr,
-		}, err
+		}, nil
+	} else {
+		return &resourcesCenter.ResourcesAuthRes{
+			Code:    0,
+			Message: "缺少参数",
+			Data:    nil,
+		}, errors.New("缺少参数")
 	}
-	return &resourcesCenter.ResourcesAuthRes{
-		Code:    0,
-		Message: "查询成功",
-		Data:    authArr,
-	}, nil
 }

rpc/internal/server/resourcescenterserver.go

@@ -22,19 +22,19 @@ func NewResourcesCenterServer(svcCtx *svc.ServiceContext) *ResourcesCenterServer
 }
 
 // 查询账户资源权限
-func (s *ResourcesCenterServer) FindResourcesAuth(ctx context.Context, in *resourcesCenter.ResourcesAuthReq) (*resourcesCenter.ResourcesAuthRes, error) {
+func (s *ResourcesCenterServer) FindResourcesAuth(ctx context.Context, in *resourcesCenter.ResourcesReq) (*resourcesCenter.ResourcesAuthRes, error) {
 	l := logic.NewFindResourcesAuthLogic(ctx, s.svcCtx)
 	return l.FindResourcesAuth(in)
 }
 
 // 查询账户资源余额
-func (s *ResourcesCenterServer) FindAccountBalance(ctx context.Context, in *resourcesCenter.AccountBalanceReq) (*resourcesCenter.AccountBalanceRes, error) {
+func (s *ResourcesCenterServer) FindAccountBalance(ctx context.Context, in *resourcesCenter.ResourcesReq) (*resourcesCenter.AccountBalanceRes, error) {
 	l := logic.NewFindAccountBalanceLogic(ctx, s.svcCtx)
 	return l.FindAccountBalance(in)
 }
 
 // 查询流水账
-func (s *ResourcesCenterServer) FindConsumeRecord(ctx context.Context, in *resourcesCenter.ConsumeRecordReq) (*resourcesCenter.ConsumeRecordRes, error) {
+func (s *ResourcesCenterServer) FindConsumeRecord(ctx context.Context, in *resourcesCenter.ResourcesReq) (*resourcesCenter.ConsumeRecordRes, error) {
 	l := logic.NewFindConsumeRecordLogic(ctx, s.svcCtx)
 	return l.FindConsumeRecord(in)
 }

rpc/resourcesCenter.proto

@@ -1,34 +1,34 @@
 syntax = "proto3";
 
 package resourcesCenter;
-option go_package = "resourcesCenter/";
- message Response {
-    int64    code =1;            //响应代码
-    string   message=2;          //响应消息
- }
-  message Balance {
-   int64    employeeId =1;           //人员标识
-   int64    companyId =2;            //企业标识
-   int64    departmentId =3;         //组织标识
-   string   name=4;                  //资源名称
-   string    code =5;                 //资源代码
-   int64    number =6;               //数量
-   string    spec =7;                 //规格
-   string   appId=8;                 //标识
-   int64    model =9;                //操作类型0使用1新增
-  }
-   message Detailed {
-      int64    employeeId =1;        //人员标识
-      int64    companyId =2;         //企业标识
-      string    resourceType =3;      //资源类型
-      int64   exportNum=4;          //导出数量
-      string    deductionType =5;     //扣类型(1高级字段包)
-      int64    ruleId =6;            //使用规则标识
-      int64    exportTime =7;        //导出时间
-      int64    userType =8;          //流水类型0使用1新增
-      int64    departmentId =9;      //组织标识
+//option go_package = "resourcesCenter/";
+message Response {
+    int64 code = 1; //响应代码
+    string message = 2; //响应消息
+}
+message Balance {
+    int64 employeeId = 1; //人员标识
+    int64 companyId = 2; //企业标识
+    int64 departmentId = 3; //组织标识
+    string name = 4; //资源名称
+    string code = 5; //资源代码
+    int64 number = 6; //数量
+    string spec = 7; //规格
+    string appId = 8; //标识
+    int64 model = 9; //操作类型0使用1新增
+}
+message Detailed {
+    int64 employeeId = 1; //人员标识
+    int64 companyId = 2; //企业标识
+    string resourceType = 3; //资源类型
+    int64 exportNum = 4; //导出数量
+    string deductionType = 5; //扣类型(1高级字段包)
+    int64 ruleId = 6; //使用规则标识
+    int64 exportTime = 7; //导出时间
+    int64 userType = 8; //流水类型0使用1新增
+    int64 departmentId = 9; //组织标识
 
-   }
+}
 
 message ResourcesAuth {
     int64 id = 1;
@@ -44,7 +44,7 @@ message ResourceBalance {
     int64 employeeId = 2; //人员标识
     string name = 3; //资源名称
     int64 number = 4; //剩余数量
-    string code = 5; //资源代码
+    string resourceType = 5; //资源代码
     string spec = 6; //规格
 }
 
@@ -61,11 +61,12 @@ message ConsumeRecord {
     int64 departmentId = 10;
 }
 
-//根据账户标识查询资源权限请求参数
-message ResourcesAuthReq {
-    int64 employeeId = 1;
+
+message ResourcesReq {
+    int64 accountId = 1;
 }
 
+//根据账户标识查询资源权限请求参数
 message ResourcesAuthRes {
     int64 code = 1; //响应代码
     string message = 2; //响应消息
@@ -73,12 +74,6 @@ message ResourcesAuthRes {
 }
 
 //根据账户标识查询账户余额
-message AccountBalanceReq {
-    int64 employeeId = 1; //用户标识
-    int64 companyId = 2; //公司标识
-    int64 departmentId = 3; //部门标识
-}
-
 message AccountBalanceRes {
     int64 code = 1;
     string message = 2;
@@ -86,11 +81,6 @@ message AccountBalanceRes {
 }
 
 //查询流水账
-message ConsumeRecordReq {
-    int64 employeeId = 1;
-    int64 companyId = 2;
-}
-
 message ConsumeRecordRes {
     int64 code = 1;
     string message = 2;
@@ -100,14 +90,14 @@ message ConsumeRecordRes {
 
 service ResourcesCenter {
     //查询账户资源权限
-    rpc findResourcesAuth (ResourcesAuthReq) returns (ResourcesAuthRes);
+    rpc findResourcesAuth (ResourcesReq) returns (ResourcesAuthRes);
     //查询账户资源余额
-    rpc findAccountBalance (AccountBalanceReq) returns (AccountBalanceRes);
+    rpc findAccountBalance (ResourcesReq) returns (AccountBalanceRes);
     //查询流水账
-    rpc findConsumeRecord (ConsumeRecordReq) returns (ConsumeRecordRes);
+    rpc findConsumeRecord (ResourcesReq) returns (ConsumeRecordRes);
 
-     //根据账户标识修改资源结存账
-      rpc updateUserBalance(Balance) returns(Response);
-      //根据账户标识记录资源使用流水账
-      rpc updateUserDetailed(Detailed) returns(Response);
+    //根据账户标识修改资源结存账
+    rpc updateUserBalance (Balance) returns (Response);
+    //根据账户标识记录资源使用流水账
+    rpc updateUserDetailed (Detailed) returns (Response);
 }

rpc/resourcesCenter/resourcesCenter.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.26.0
+// 	protoc-gen-go v1.25.0
 // 	protoc        v3.15.1
 // source: resourcesCenter.proto
 
@@ -8,6 +8,7 @@ package resourcesCenter
 
 import (
 	context "context"
+	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -24,6 +25,11 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+//option go_package = "resourcesCenter/";
 type Response struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -393,12 +399,12 @@ type ResourceBalance struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id         int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	EmployeeId int64  `protobuf:"varint,2,opt,name=employeeId,proto3" json:"employeeId,omitempty"` //人员标识
-	Name       string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`              //资源名称
-	Number     int64  `protobuf:"varint,4,opt,name=number,proto3" json:"number,omitempty"`         //剩余数量
-	Code       string `protobuf:"bytes,5,opt,name=code,proto3" json:"code,omitempty"`              //资源代码
-	Spec       string `protobuf:"bytes,6,opt,name=spec,proto3" json:"spec,omitempty"`              //规格
+	Id           int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	EmployeeId   int64  `protobuf:"varint,2,opt,name=employeeId,proto3" json:"employeeId,omitempty"`    //人员标识
+	Name         string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`                 //资源名称
+	Number       int64  `protobuf:"varint,4,opt,name=number,proto3" json:"number,omitempty"`            //剩余数量
+	ResourceType string `protobuf:"bytes,5,opt,name=resourceType,proto3" json:"resourceType,omitempty"` //资源代码
+	Spec         string `protobuf:"bytes,6,opt,name=spec,proto3" json:"spec,omitempty"`                 //规格
 }
 
 func (x *ResourceBalance) Reset() {
@@ -461,9 +467,9 @@ func (x *ResourceBalance) GetNumber() int64 {
 	return 0
 }
 
-func (x *ResourceBalance) GetCode() string {
+func (x *ResourceBalance) GetResourceType() string {
 	if x != nil {
-		return x.Code
+		return x.ResourceType
 	}
 	return ""
 }
@@ -594,17 +600,16 @@ func (x *ConsumeRecord) GetDepartmentId() int64 {
 	return 0
 }
 
-//根据账户标识查询资源权限请求参数
-type ResourcesAuthReq struct {
+type ResourcesReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	EmployeeId int64 `protobuf:"varint,1,opt,name=employeeId,proto3" json:"employeeId,omitempty"`
+	AccountId int64 `protobuf:"varint,1,opt,name=accountId,proto3" json:"accountId,omitempty"`
 }
 
-func (x *ResourcesAuthReq) Reset() {
-	*x = ResourcesAuthReq{}
+func (x *ResourcesReq) Reset() {
+	*x = ResourcesReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_resourcesCenter_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -612,13 +617,13 @@ func (x *ResourcesAuthReq) Reset() {
 	}
 }
 
-func (x *ResourcesAuthReq) String() string {
+func (x *ResourcesReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ResourcesAuthReq) ProtoMessage() {}
+func (*ResourcesReq) ProtoMessage() {}
 
-func (x *ResourcesAuthReq) ProtoReflect() protoreflect.Message {
+func (x *ResourcesReq) ProtoReflect() protoreflect.Message {
 	mi := &file_resourcesCenter_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -630,18 +635,19 @@ func (x *ResourcesAuthReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ResourcesAuthReq.ProtoReflect.Descriptor instead.
-func (*ResourcesAuthReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use ResourcesReq.ProtoReflect.Descriptor instead.
+func (*ResourcesReq) Descriptor() ([]byte, []int) {
 	return file_resourcesCenter_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *ResourcesAuthReq) GetEmployeeId() int64 {
+func (x *ResourcesReq) GetAccountId() int64 {
 	if x != nil {
-		return x.EmployeeId
+		return x.AccountId
 	}
 	return 0
 }
 
+//根据账户标识查询资源权限请求参数
 type ResourcesAuthRes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -706,69 +712,6 @@ func (x *ResourcesAuthRes) GetData() []*ResourcesAuth {
 }
 
 //根据账户标识查询账户余额
-type AccountBalanceReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EmployeeId   int64 `protobuf:"varint,1,opt,name=employeeId,proto3" json:"employeeId,omitempty"`     //用户标识
-	CompanyId    int64 `protobuf:"varint,2,opt,name=companyId,proto3" json:"companyId,omitempty"`       //公司标识
-	DepartmentId int64 `protobuf:"varint,3,opt,name=departmentId,proto3" json:"departmentId,omitempty"` //部门标识
-}
-
-func (x *AccountBalanceReq) Reset() {
-	*x = AccountBalanceReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AccountBalanceReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AccountBalanceReq) ProtoMessage() {}
-
-func (x *AccountBalanceReq) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AccountBalanceReq.ProtoReflect.Descriptor instead.
-func (*AccountBalanceReq) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *AccountBalanceReq) GetEmployeeId() int64 {
-	if x != nil {
-		return x.EmployeeId
-	}
-	return 0
-}
-
-func (x *AccountBalanceReq) GetCompanyId() int64 {
-	if x != nil {
-		return x.CompanyId
-	}
-	return 0
-}
-
-func (x *AccountBalanceReq) GetDepartmentId() int64 {
-	if x != nil {
-		return x.DepartmentId
-	}
-	return 0
-}
-
 type AccountBalanceRes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -782,7 +725,7 @@ type AccountBalanceRes struct {
 func (x *AccountBalanceRes) Reset() {
 	*x = AccountBalanceRes{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[9]
+		mi := &file_resourcesCenter_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -795,7 +738,7 @@ func (x *AccountBalanceRes) String() string {
 func (*AccountBalanceRes) ProtoMessage() {}
 
 func (x *AccountBalanceRes) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[9]
+	mi := &file_resourcesCenter_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -808,7 +751,7 @@ func (x *AccountBalanceRes) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AccountBalanceRes.ProtoReflect.Descriptor instead.
 func (*AccountBalanceRes) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{9}
+	return file_resourcesCenter_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *AccountBalanceRes) GetCode() int64 {
@@ -833,61 +776,6 @@ func (x *AccountBalanceRes) GetData() []*ResourceBalance {
 }
 
 //查询流水账
-type ConsumeRecordReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	EmployeeId int64 `protobuf:"varint,1,opt,name=employeeId,proto3" json:"employeeId,omitempty"`
-	CompanyId  int64 `protobuf:"varint,2,opt,name=companyId,proto3" json:"companyId,omitempty"`
-}
-
-func (x *ConsumeRecordReq) Reset() {
-	*x = ConsumeRecordReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConsumeRecordReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConsumeRecordReq) ProtoMessage() {}
-
-func (x *ConsumeRecordReq) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConsumeRecordReq.ProtoReflect.Descriptor instead.
-func (*ConsumeRecordReq) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *ConsumeRecordReq) GetEmployeeId() int64 {
-	if x != nil {
-		return x.EmployeeId
-	}
-	return 0
-}
-
-func (x *ConsumeRecordReq) GetCompanyId() int64 {
-	if x != nil {
-		return x.CompanyId
-	}
-	return 0
-}
-
 type ConsumeRecordRes struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -901,7 +789,7 @@ type ConsumeRecordRes struct {
 func (x *ConsumeRecordRes) Reset() {
 	*x = ConsumeRecordRes{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[11]
+		mi := &file_resourcesCenter_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -914,7 +802,7 @@ func (x *ConsumeRecordRes) String() string {
 func (*ConsumeRecordRes) ProtoMessage() {}
 
 func (x *ConsumeRecordRes) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[11]
+	mi := &file_resourcesCenter_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -927,7 +815,7 @@ func (x *ConsumeRecordRes) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConsumeRecordRes.ProtoReflect.Descriptor instead.
 func (*ConsumeRecordRes) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{11}
+	return file_resourcesCenter_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *ConsumeRecordRes) GetCode() int64 {
@@ -1004,15 +892,16 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x71, 0x75, 0x6f, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x05,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x73,
 	0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x22, 0x95, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x61,
+	0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x61,
 	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x6d, 0x70, 0x6c, 0x6f, 0x79, 0x65,
 	0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x6d, 0x70, 0x6c, 0x6f,
 	0x79, 0x65, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d,
 	0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x06, 0x20,
+	0x72, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x06, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0xbd, 0x02, 0x0a, 0x0d, 0x43, 0x6f,
 	0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x65,
@@ -1033,74 +922,59 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x75, 0x73, 0x65,
 	0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74, 0x6d,
 	0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65, 0x70,
-	0x61, 0x72, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x32, 0x0a, 0x10, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a,
-	0x0a, 0x65, 0x6d, 0x70, 0x6c, 0x6f, 0x79, 0x65, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0a, 0x65, 0x6d, 0x70, 0x6c, 0x6f, 0x79, 0x65, 0x65, 0x49, 0x64, 0x22, 0x74, 0x0a,
-	0x10, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65,
-	0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x32, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x11, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x6d, 0x70, 0x6c,
-	0x6f, 0x79, 0x65, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x6d,
-	0x70, 0x6c, 0x6f, 0x79, 0x65, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70,
-	0x61, 0x6e, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6f, 0x6d,
-	0x70, 0x61, 0x6e, 0x79, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65, 0x70, 0x61, 0x72, 0x74,
-	0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x64, 0x65,
-	0x70, 0x61, 0x72, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x77, 0x0a, 0x11, 0x41, 0x63,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x12,
-	0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x34, 0x0a,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x22, 0x50, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x6d, 0x70, 0x6c, 0x6f,
-	0x79, 0x65, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x6d, 0x70,
-	0x6c, 0x6f, 0x79, 0x65, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x61,
-	0x6e, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70,
-	0x61, 0x6e, 0x79, 0x49, 0x64, 0x22, 0x74, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65,
-	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a,
-	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52,
-	0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xbb, 0x03, 0x0a, 0x0f,
-	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12,
-	0x59, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x41, 0x75, 0x74, 0x68, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x61, 0x72, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0c, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x74, 0x0a, 0x10, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
 	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x12, 0x66, 0x69,
-	0x6e, 0x64, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x12, 0x22, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x12, 0x59, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x2e,
-	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71,
-	0x1a, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x52, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x11, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65,
-	0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x42, 0x61, 0x6c, 0x61, 0x6e,
-	0x63, 0x65, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4a, 0x0a,
-	0x12, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x65, 0x64, 0x12, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43,
-	0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x1a, 0x19,
+	0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x77, 0x0a,
+	0x11, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52,
+	0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x12, 0x34, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20,
 	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x12, 0x5a, 0x10, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x62, 0x06, 0x70,
+	0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
+	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x74, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d,
+	0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
+	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65,
+	0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xae, 0x03, 0x0a,
+	0x0f, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x12, 0x55, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x41, 0x75, 0x74, 0x68, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x41, 0x75, 0x74, 0x68, 0x52, 0x65, 0x73, 0x12, 0x57, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e,
+	0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x12, 0x55, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65,
+	0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x12, 0x48, 0x0a, 0x11, 0x75, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x18, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x42,
+	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x4a, 0x0a, 0x12, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c,
+	0x65, 0x64, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
+	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
@@ -1116,7 +990,7 @@ func file_resourcesCenter_proto_rawDescGZIP() []byte {
 	return file_resourcesCenter_proto_rawDescData
 }
 
-var file_resourcesCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_resourcesCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_resourcesCenter_proto_goTypes = []interface{}{
 	(*Response)(nil),          // 0: resourcesCenter.Response
 	(*Balance)(nil),           // 1: resourcesCenter.Balance
@@ -1124,32 +998,30 @@ var file_resourcesCenter_proto_goTypes = []interface{}{
 	(*ResourcesAuth)(nil),     // 3: resourcesCenter.ResourcesAuth
 	(*ResourceBalance)(nil),   // 4: resourcesCenter.ResourceBalance
 	(*ConsumeRecord)(nil),     // 5: resourcesCenter.ConsumeRecord
-	(*ResourcesAuthReq)(nil),  // 6: resourcesCenter.ResourcesAuthReq
+	(*ResourcesReq)(nil),      // 6: resourcesCenter.ResourcesReq
 	(*ResourcesAuthRes)(nil),  // 7: resourcesCenter.ResourcesAuthRes
-	(*AccountBalanceReq)(nil), // 8: resourcesCenter.AccountBalanceReq
-	(*AccountBalanceRes)(nil), // 9: resourcesCenter.AccountBalanceRes
-	(*ConsumeRecordReq)(nil),  // 10: resourcesCenter.ConsumeRecordReq
-	(*ConsumeRecordRes)(nil),  // 11: resourcesCenter.ConsumeRecordRes
+	(*AccountBalanceRes)(nil), // 8: resourcesCenter.AccountBalanceRes
+	(*ConsumeRecordRes)(nil),  // 9: resourcesCenter.ConsumeRecordRes
 }
 var file_resourcesCenter_proto_depIdxs = []int32{
-	3,  // 0: resourcesCenter.ResourcesAuthRes.data:type_name -> resourcesCenter.ResourcesAuth
-	4,  // 1: resourcesCenter.AccountBalanceRes.data:type_name -> resourcesCenter.ResourceBalance
-	5,  // 2: resourcesCenter.ConsumeRecordRes.data:type_name -> resourcesCenter.ConsumeRecord
-	6,  // 3: resourcesCenter.ResourcesCenter.findResourcesAuth:input_type -> resourcesCenter.ResourcesAuthReq
-	8,  // 4: resourcesCenter.ResourcesCenter.findAccountBalance:input_type -> resourcesCenter.AccountBalanceReq
-	10, // 5: resourcesCenter.ResourcesCenter.findConsumeRecord:input_type -> resourcesCenter.ConsumeRecordReq
-	1,  // 6: resourcesCenter.ResourcesCenter.updateUserBalance:input_type -> resourcesCenter.Balance
-	2,  // 7: resourcesCenter.ResourcesCenter.updateUserDetailed:input_type -> resourcesCenter.Detailed
-	7,  // 8: resourcesCenter.ResourcesCenter.findResourcesAuth:output_type -> resourcesCenter.ResourcesAuthRes
-	9,  // 9: resourcesCenter.ResourcesCenter.findAccountBalance:output_type -> resourcesCenter.AccountBalanceRes
-	11, // 10: resourcesCenter.ResourcesCenter.findConsumeRecord:output_type -> resourcesCenter.ConsumeRecordRes
-	0,  // 11: resourcesCenter.ResourcesCenter.updateUserBalance:output_type -> resourcesCenter.Response
-	0,  // 12: resourcesCenter.ResourcesCenter.updateUserDetailed:output_type -> resourcesCenter.Response
-	8,  // [8:13] is the sub-list for method output_type
-	3,  // [3:8] is the sub-list for method input_type
-	3,  // [3:3] is the sub-list for extension type_name
-	3,  // [3:3] is the sub-list for extension extendee
-	0,  // [0:3] is the sub-list for field type_name
+	3, // 0: resourcesCenter.ResourcesAuthRes.data:type_name -> resourcesCenter.ResourcesAuth
+	4, // 1: resourcesCenter.AccountBalanceRes.data:type_name -> resourcesCenter.ResourceBalance
+	5, // 2: resourcesCenter.ConsumeRecordRes.data:type_name -> resourcesCenter.ConsumeRecord
+	6, // 3: resourcesCenter.ResourcesCenter.findResourcesAuth:input_type -> resourcesCenter.ResourcesReq
+	6, // 4: resourcesCenter.ResourcesCenter.findAccountBalance:input_type -> resourcesCenter.ResourcesReq
+	6, // 5: resourcesCenter.ResourcesCenter.findConsumeRecord:input_type -> resourcesCenter.ResourcesReq
+	1, // 6: resourcesCenter.ResourcesCenter.updateUserBalance:input_type -> resourcesCenter.Balance
+	2, // 7: resourcesCenter.ResourcesCenter.updateUserDetailed:input_type -> resourcesCenter.Detailed
+	7, // 8: resourcesCenter.ResourcesCenter.findResourcesAuth:output_type -> resourcesCenter.ResourcesAuthRes
+	8, // 9: resourcesCenter.ResourcesCenter.findAccountBalance:output_type -> resourcesCenter.AccountBalanceRes
+	9, // 10: resourcesCenter.ResourcesCenter.findConsumeRecord:output_type -> resourcesCenter.ConsumeRecordRes
+	0, // 11: resourcesCenter.ResourcesCenter.updateUserBalance:output_type -> resourcesCenter.Response
+	0, // 12: resourcesCenter.ResourcesCenter.updateUserDetailed:output_type -> resourcesCenter.Response
+	8, // [8:13] is the sub-list for method output_type
+	3, // [3:8] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_resourcesCenter_proto_init() }
@@ -1231,7 +1103,7 @@ func file_resourcesCenter_proto_init() {
 			}
 		}
 		file_resourcesCenter_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ResourcesAuthReq); i {
+			switch v := v.(*ResourcesReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1255,18 +1127,6 @@ func file_resourcesCenter_proto_init() {
 			}
 		}
 		file_resourcesCenter_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AccountBalanceReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_resourcesCenter_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AccountBalanceRes); i {
 			case 0:
 				return &v.state
@@ -1278,19 +1138,7 @@ func file_resourcesCenter_proto_init() {
 				return nil
 			}
 		}
-		file_resourcesCenter_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConsumeRecordReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_resourcesCenter_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_resourcesCenter_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConsumeRecordRes); i {
 			case 0:
 				return &v.state
@@ -1309,7 +1157,7 @@ func file_resourcesCenter_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_resourcesCenter_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -1336,11 +1184,11 @@ const _ = grpc.SupportPackageIsVersion6
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type ResourcesCenterClient interface {
 	//查询账户资源权限
-	FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq, opts ...grpc.CallOption) (*ResourcesAuthRes, error)
+	FindResourcesAuth(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*ResourcesAuthRes, error)
 	//查询账户资源余额
-	FindAccountBalance(ctx context.Context, in *AccountBalanceReq, opts ...grpc.CallOption) (*AccountBalanceRes, error)
+	FindAccountBalance(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error)
 	//查询流水账
-	FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error)
+	FindConsumeRecord(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error)
 	//根据账户标识修改资源结存账
 	UpdateUserBalance(ctx context.Context, in *Balance, opts ...grpc.CallOption) (*Response, error)
 	//根据账户标识记录资源使用流水账
@@ -1355,7 +1203,7 @@ func NewResourcesCenterClient(cc grpc.ClientConnInterface) ResourcesCenterClient
 	return &resourcesCenterClient{cc}
 }
 
-func (c *resourcesCenterClient) FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq, opts ...grpc.CallOption) (*ResourcesAuthRes, error) {
+func (c *resourcesCenterClient) FindResourcesAuth(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*ResourcesAuthRes, error) {
 	out := new(ResourcesAuthRes)
 	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findResourcesAuth", in, out, opts...)
 	if err != nil {
@@ -1364,7 +1212,7 @@ func (c *resourcesCenterClient) FindResourcesAuth(ctx context.Context, in *Resou
 	return out, nil
 }
 
-func (c *resourcesCenterClient) FindAccountBalance(ctx context.Context, in *AccountBalanceReq, opts ...grpc.CallOption) (*AccountBalanceRes, error) {
+func (c *resourcesCenterClient) FindAccountBalance(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error) {
 	out := new(AccountBalanceRes)
 	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findAccountBalance", in, out, opts...)
 	if err != nil {
@@ -1373,7 +1221,7 @@ func (c *resourcesCenterClient) FindAccountBalance(ctx context.Context, in *Acco
 	return out, nil
 }
 
-func (c *resourcesCenterClient) FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error) {
+func (c *resourcesCenterClient) FindConsumeRecord(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error) {
 	out := new(ConsumeRecordRes)
 	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findConsumeRecord", in, out, opts...)
 	if err != nil {
@@ -1403,11 +1251,11 @@ func (c *resourcesCenterClient) UpdateUserDetailed(ctx context.Context, in *Deta
 // ResourcesCenterServer is the server API for ResourcesCenter service.
 type ResourcesCenterServer interface {
 	//查询账户资源权限
-	FindResourcesAuth(context.Context, *ResourcesAuthReq) (*ResourcesAuthRes, error)
+	FindResourcesAuth(context.Context, *ResourcesReq) (*ResourcesAuthRes, error)
 	//查询账户资源余额
-	FindAccountBalance(context.Context, *AccountBalanceReq) (*AccountBalanceRes, error)
+	FindAccountBalance(context.Context, *ResourcesReq) (*AccountBalanceRes, error)
 	//查询流水账
-	FindConsumeRecord(context.Context, *ConsumeRecordReq) (*ConsumeRecordRes, error)
+	FindConsumeRecord(context.Context, *ResourcesReq) (*ConsumeRecordRes, error)
 	//根据账户标识修改资源结存账
 	UpdateUserBalance(context.Context, *Balance) (*Response, error)
 	//根据账户标识记录资源使用流水账
@@ -1418,13 +1266,13 @@ type ResourcesCenterServer interface {
 type UnimplementedResourcesCenterServer struct {
 }
 
-func (*UnimplementedResourcesCenterServer) FindResourcesAuth(context.Context, *ResourcesAuthReq) (*ResourcesAuthRes, error) {
+func (*UnimplementedResourcesCenterServer) FindResourcesAuth(context.Context, *ResourcesReq) (*ResourcesAuthRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindResourcesAuth not implemented")
 }
-func (*UnimplementedResourcesCenterServer) FindAccountBalance(context.Context, *AccountBalanceReq) (*AccountBalanceRes, error) {
+func (*UnimplementedResourcesCenterServer) FindAccountBalance(context.Context, *ResourcesReq) (*AccountBalanceRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindAccountBalance not implemented")
 }
-func (*UnimplementedResourcesCenterServer) FindConsumeRecord(context.Context, *ConsumeRecordReq) (*ConsumeRecordRes, error) {
+func (*UnimplementedResourcesCenterServer) FindConsumeRecord(context.Context, *ResourcesReq) (*ConsumeRecordRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindConsumeRecord not implemented")
 }
 func (*UnimplementedResourcesCenterServer) UpdateUserBalance(context.Context, *Balance) (*Response, error) {
@@ -1439,7 +1287,7 @@ func RegisterResourcesCenterServer(s *grpc.Server, srv ResourcesCenterServer) {
 }
 
 func _ResourcesCenter_FindResourcesAuth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ResourcesAuthReq)
+	in := new(ResourcesReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1451,13 +1299,13 @@ func _ResourcesCenter_FindResourcesAuth_Handler(srv interface{}, ctx context.Con
 		FullMethod: "/resourcesCenter.ResourcesCenter/FindResourcesAuth",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourcesCenterServer).FindResourcesAuth(ctx, req.(*ResourcesAuthReq))
+		return srv.(ResourcesCenterServer).FindResourcesAuth(ctx, req.(*ResourcesReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _ResourcesCenter_FindAccountBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AccountBalanceReq)
+	in := new(ResourcesReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1469,13 +1317,13 @@ func _ResourcesCenter_FindAccountBalance_Handler(srv interface{}, ctx context.Co
 		FullMethod: "/resourcesCenter.ResourcesCenter/FindAccountBalance",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourcesCenterServer).FindAccountBalance(ctx, req.(*AccountBalanceReq))
+		return srv.(ResourcesCenterServer).FindAccountBalance(ctx, req.(*ResourcesReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _ResourcesCenter_FindConsumeRecord_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ConsumeRecordReq)
+	in := new(ResourcesReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1487,7 +1335,7 @@ func _ResourcesCenter_FindConsumeRecord_Handler(srv interface{}, ctx context.Con
 		FullMethod: "/resourcesCenter.ResourcesCenter/FindConsumeRecord",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ResourcesCenterServer).FindConsumeRecord(ctx, req.(*ConsumeRecordReq))
+		return srv.(ResourcesCenterServer).FindConsumeRecord(ctx, req.(*ResourcesReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }

rpc/resourcesCenterclient/resourcescenter.go

@@ -1,9 +1,9 @@
 // Code generated by goctl. DO NOT EDIT!
 // Source: resourcesCenter.proto
 
-//go:generate mockgen -destination ./resourcescenter_mock.go -package resourcescenter -source $GOFILE
+//go:generate mockgen -destination ./resourcescenter_mock.go -package resourcescenterclient -source $GOFILE
 
-package resourcesCenterclient
+package resourcescenterclient
 
 import (
 	"context"
@@ -14,26 +14,24 @@ import (
 )
 
 type (
-	Detailed          = resourcesCenter.Detailed
-	ResourcesAuth     = resourcesCenter.ResourcesAuth
 	ResourceBalance   = resourcesCenter.ResourceBalance
-	AccountBalanceReq = resourcesCenter.AccountBalanceReq
+	ConsumeRecord     = resourcesCenter.ConsumeRecord
+	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
+	ResourcesAuth     = resourcesCenter.ResourcesAuth
+	ResourcesReq      = resourcesCenter.ResourcesReq
+	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
 	AccountBalanceRes = resourcesCenter.AccountBalanceRes
-	ConsumeRecordReq  = resourcesCenter.ConsumeRecordReq
 	Response          = resourcesCenter.Response
 	Balance           = resourcesCenter.Balance
-	ConsumeRecord     = resourcesCenter.ConsumeRecord
-	ResourcesAuthReq  = resourcesCenter.ResourcesAuthReq
-	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
-	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
+	Detailed          = resourcesCenter.Detailed
 
 	ResourcesCenter interface {
 		// 查询账户资源权限
-		FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq) (*ResourcesAuthRes, error)
+		FindResourcesAuth(ctx context.Context, in *ResourcesReq) (*ResourcesAuthRes, error)
 		// 查询账户资源余额
-		FindAccountBalance(ctx context.Context, in *AccountBalanceReq) (*AccountBalanceRes, error)
+		FindAccountBalance(ctx context.Context, in *ResourcesReq) (*AccountBalanceRes, error)
 		// 查询流水账
-		FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq) (*ConsumeRecordRes, error)
+		FindConsumeRecord(ctx context.Context, in *ResourcesReq) (*ConsumeRecordRes, error)
 		// 根据账户标识修改资源结存账
 		UpdateUserBalance(ctx context.Context, in *Balance) (*Response, error)
 		// 根据账户标识记录资源使用流水账
@@ -52,19 +50,19 @@ func NewResourcesCenter(cli zrpc.Client) ResourcesCenter {
 }
 
 // 查询账户资源权限
-func (m *defaultResourcesCenter) FindResourcesAuth(ctx context.Context, in *ResourcesAuthReq) (*ResourcesAuthRes, error) {
+func (m *defaultResourcesCenter) FindResourcesAuth(ctx context.Context, in *ResourcesReq) (*ResourcesAuthRes, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
 	return client.FindResourcesAuth(ctx, in)
 }
 
 // 查询账户资源余额
-func (m *defaultResourcesCenter) FindAccountBalance(ctx context.Context, in *AccountBalanceReq) (*AccountBalanceRes, error) {
+func (m *defaultResourcesCenter) FindAccountBalance(ctx context.Context, in *ResourcesReq) (*AccountBalanceRes, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
 	return client.FindAccountBalance(ctx, in)
 }
 
 // 查询流水账
-func (m *defaultResourcesCenter) FindConsumeRecord(ctx context.Context, in *ConsumeRecordReq) (*ConsumeRecordRes, error) {
+func (m *defaultResourcesCenter) FindConsumeRecord(ctx context.Context, in *ResourcesReq) (*ConsumeRecordRes, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
 	return client.FindConsumeRecord(ctx, in)
 }

rpc/test/resourcesRecord_test.go

@@ -21,8 +21,33 @@ func init() {
 func Test_FindResourcesAuth(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
-	req := &resourcesCenter.ResourcesAuthReq{}
-	req.EmployeeId = 6
+	req := &resourcesCenter.ResourcesReq{
+		AccountId:6,
+	}
 	res, err := FileSystem.FindResourcesAuth(ctx, req)
-	log.Println("结果", res, "报错：", err)
+	log.Println("结果", res)
+	log.Println("报错：", err)
 }
+
+func Test_FindAccountBalance(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
+	req := &resourcesCenter.ResourcesReq{
+		AccountId:6,
+	}
+	res, err := FileSystem.FindAccountBalance(ctx, req)
+	log.Println("结果", res)
+	log.Println("报错：", err)
+}
+
+func Test_FindConsumeRecord(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
+	FileSystem := resourcesCenterclient.NewResourcesCenter(zrpc.MustNewClient(c.FileSystemConf))
+	req := &resourcesCenter.ResourcesReq{
+		AccountId:6,
+	}
+	res, err := FileSystem.FindConsumeRecord(ctx, req)
+	log.Println("结果", res)
+	log.Println("报错：", err)
+}
+

service/resourceManageService.go

@@ -8,62 +8,73 @@ import (
 type ResourceManageService struct{}
 
 //查询用户资源权限
-func (service *ResourceManageService) FindResourcesAuth(data *resourcesCenter.ResourcesAuthReq) ([]*resourcesCenter.ResourcesAuth, error) {
+func (service *ResourceManageService) FindResourcesAuth(data *resourcesCenter.ResourcesReq) ([]*resourcesCenter.ResourcesAuth, error) {
 	orm := entity.Engine.NewSession()
 	var authArr []*entity.ResourcesAuth
-	var authList []*resourcesCenter.ResourcesAuth
-	err := orm.Table("resources_authorization").Select("*").Where("employeeId = ?", data.EmployeeId).Find(&authArr)
+	authList := make([]*resourcesCenter.ResourcesAuth, 0)
+	err := orm.Table("resources_authorization").Select("*").
+		Where("accountId = ? and state = 1", data.AccountId).Find(&authArr)
 	if err != nil {
 		return authList, err
 	}
 	for _, v := range authArr {
-		authList = append(authList,&resourcesCenter.ResourcesAuth{
-			Id:v.Id,
-			EmployeeId:v.EmployeeId,
-			ResourcesId:v.ResourcesId,
-			Quota:v.Quota,
-			State:v.State,
-			Ratio:v.Ratio,
+		authList = append(authList, &resourcesCenter.ResourcesAuth{
+			Id:          v.Id,
+			EmployeeId:  v.EmployeeId,
+			ResourcesId: v.ResourcesId,
+			Quota:       v.Quota,
+			State:       v.State,
+			Ratio:       v.Ratio,
 		})
 	}
 	return authList, nil
 }
 
 //查询账户资源余额
-func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.AccountBalanceReq)([]*resourcesCenter.ResourceBalance,error){
+func (service *ResourceManageService) FindAccountBalance(in *resourcesCenter.ResourcesReq) ([]*resourcesCenter.ResourceBalance, error) {
 	orm := entity.Engine.NewSession()
 	var accountBalanceArr []*entity.AccountBalance
-	var dataList []*resourcesCenter.ResourceBalance
-	err := orm.Table("account_resources").Where("employeeId = ?", in.EmployeeId).Find(&accountBalanceArr)
+	dataList := make([]*resourcesCenter.ResourceBalance, 0)
+	err := orm.Table("account_resources").
+		Where("accountId = ?", in.AccountId).Find(&accountBalanceArr)
 	if err != nil {
 		return dataList, err
 	}
 	for _, v := range accountBalanceArr {
-		dataList = append(dataList,&resourcesCenter.ResourceBalance{
-			Id:v.Id,
-			EmployeeId:v.EmployeeId,
-			Name:v.Name,
-			Code:v.Code,
-			Number:v.Number,
-			Spec:v.Spec,
+		dataList = append(dataList, &resourcesCenter.ResourceBalance{
+			Id:           v.Id,
+			EmployeeId:   v.EmployeeId,
+			Name:         v.Name,
+			ResourceType: v.ResourceType,
+			Number:       v.Number,
+			Spec:         v.Spec,
 		})
 	}
 	return dataList, nil
 }
 
 //查询账户资源余额
-func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.ConsumeRecordReq)([]*resourcesCenter.ConsumeRecord,error){
+func (service *ResourceManageService) FindConsumeRecord(in *resourcesCenter.ResourcesReq) ([]*resourcesCenter.ConsumeRecord, error) {
 	orm := entity.Engine.NewSession()
 	var recordArr []*entity.ConsumeRecord
-	var dataList []*resourcesCenter.ConsumeRecord
-	err := orm.Table("consume_record").Where("employeeId = ?", in.EmployeeId).Find(&recordArr)
+	dataList := make([]*resourcesCenter.ConsumeRecord, 0)
+	err := orm.Table("consume_record").
+		Where("accountId = ?", in.AccountId).Find(&recordArr)
 	if err != nil {
 		return dataList, err
 	}
 	for _, v := range recordArr {
-		dataList = append(dataList,&resourcesCenter.ConsumeRecord{
-			Id:v.Id,
-
+		dataList = append(dataList, &resourcesCenter.ConsumeRecord{
+			Id:            v.Id,
+			EmployeeId:    v.EmployeeId,
+			CompanyId:     v.CompanyId,
+			DepartmentId:  v.DepartmentId,
+			ResourceType:  v.ResourceType,
+			ExportNum:     v.ExportNum,
+			DeductionType: v.DeductionType,
+			RuleId:        v.RuleId,
+			ExportTime:    v.ExportTime,
+			UserType:      v.UserType,
 		})
 	}
 	return dataList, nil