jiaojiao7 4 ani în urmă
părinte
comite
6cb0debda9

+ 1 - 1
entity/accountResources.go

@@ -2,7 +2,7 @@ package entity
 
 type Balance struct {
 	Id           int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	AccountId    int64  `xorm:"accountId" form:"accountId" json:"accountId"`          //账户标识
+	AccountId    string  `xorm:"accountId" form:"accountId" json:"accountId"`          //账户标识
 	CompanyId    int64  `xorm:"companyId" form:"companyId" json:"companyId"`          //企业标识
 	DepartmentId int64  `xorm:"departmentId" form:"departmentId" json:"departmentId"` //组织标识
 	Name         string `xorm:"name" form:"name" json:"name"`                         //资源名称

+ 1 - 1
entity/detailed.go

@@ -4,7 +4,7 @@ import "time"
 
 type Detailed struct {
 	Id            int64     `xorm:"pk autoincr id" form:"id" json:"id"`
-	AccountId     int64     `xorm:"accountId" form:"accountId" json:"accountId"`             //账户标识
+	AccountId     string     `xorm:"accountId" form:"accountId" json:"accountId"`             //账户标识
 	CompanyId     int64     `xorm:"companyId" form:"companyId" json:"companyId"`             //企业标识
 	DepartmentId  int64     `xorm:"departmentId" form:"departmentId" json:"departmentId"`    //组织标识
 	ResourceType  string    `xorm:"resourceType" form:"resourceType" json:"resourceType"`    //资源类型

+ 2 - 2
entity/resources.go

@@ -11,7 +11,7 @@ type ResourcesAuth struct {
 
 type AccountBalance struct {
 	Id           int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	AccountId    int64  `xorm:"accountId" form:"accountId" json:"accountId"`          //人员标识
+	AccountId    string  `xorm:"accountId" form:"accountId" json:"accountId"`          //人员标识
 	Name         string `xorm:"name" form:"name" json:"name"`                         //资源名称
 	Number       int64  `xorm:"number" form:"number" json:"number"`                   //余额
 	ResourceType string `xorm:"resourceType" form:"resourceType" json:"resourceType"` //资源代码
@@ -20,7 +20,7 @@ type AccountBalance struct {
 
 type ConsumeRecord struct {
 	Id            int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	AccountId     int64  `xorm:"accountId" form:"accountId" json:"accountId"`             //人员标识; //用户标识
+	AccountId     string  `xorm:"accountId" form:"accountId" json:"accountId"`             //人员标识; //用户标识
 	CompanyId     int64  `xorm:"companyId" form:"companyId" json:"companyId"`             //用户标识
 	ResourceType  string `xorm:"resourceType" form:"resourceType" json:"resourceType"`    //资源类型
 	ExportNum     int64  `xorm:"exportNum" form:"exportNum" json:"exportNum"`             //导出数量

+ 1 - 1
rpc/internal/logic/findaccountbalancelogic.go

@@ -26,7 +26,7 @@ func NewFindAccountBalanceLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *FindAccountBalanceLogic) FindAccountBalance(in *resourcesCenter.ResourcesReq) (*resourcesCenter.AccountBalanceRes, error) {
 	// todo: add your logic here and delete this line
-	if in.AccountId != 0 {
+	if in.AccountId != "" {
 		dataList, err := resourceManageService.FindAccountBalance(in)
 
 		if len(dataList) == 0 && err != nil {

+ 1 - 1
rpc/internal/logic/findconsumerecordlogic.go

@@ -26,7 +26,7 @@ func NewFindConsumeRecordLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *FindConsumeRecordLogic) FindConsumeRecord(in *resourcesCenter.ResourcesReq) (*resourcesCenter.ConsumeRecordRes, error) {
 	// todo: add your logic here and delete this line
-	if in.AccountId != 0 {
+	if in.AccountId != "" {
 		recordArr, err := resourceManageService.FindConsumeRecord(in)
 		if len(recordArr) == 0 && err != nil {
 			return &resourcesCenter.ConsumeRecordRes{

+ 1 - 1
rpc/internal/logic/findresourcesauthlogic.go

@@ -29,7 +29,7 @@ func NewFindResourcesAuthLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *FindResourcesAuthLogic) FindResourcesAuth(in *resourcesCenter.ResourcesReq) (*resourcesCenter.AccountBalanceRes, error) {
 	// todo: add your logic here and delete this line
-	if in.AccountId != 0 {
+	if in.AccountId != "" {
 		authArr, err := resourceManageService.FindResourcesAuth(in)
 		if len(authArr) == 0 && err != nil {
 			return &resourcesCenter.AccountBalanceRes{

+ 6 - 6
rpc/resourcesCenter.proto

@@ -7,7 +7,7 @@ message Response {
     string message = 2; //响应消息
 }
 message Balance {
-    int64 accountId = 1; //账户标识
+    string accountId = 1; //账户标识
     int64 companyId = 2; //企业标识
     int64 departmentId = 3; //组织标识
     string name = 4; //资源名称
@@ -18,7 +18,7 @@ message Balance {
     int64 model = 9; //操作类型0使用1新增
 }
 message Detailed {
-    int64 accountId = 1; //账户标识
+    string accountId = 1; //账户标识
     int64 companyId = 2; //企业标识
     string resourceType = 3; //资源类型
     int64 exportNum = 4; //导出数量
@@ -32,7 +32,7 @@ message Detailed {
 
 message ResourcesAuth {
     int64 id = 1;
-    int64 accountId = 2; //账户标识
+    string accountId = 2; //账户标识
     int64 resourcesId = 3; //资源标识
     int64 quota = 4; //定额
     int64 ratio = 5; //比例
@@ -41,7 +41,7 @@ message ResourcesAuth {
 
 message ResourceBalance {
     int64 id = 1;
-    int64 accountId = 2; //人员标识
+    string accountId = 2; //人员标识
     string name = 3; //资源名称
     int64 number = 4; //剩余数量
     string resourceType = 5; //资源代码
@@ -50,7 +50,7 @@ message ResourceBalance {
 
 message ConsumeRecord {
     int64 id = 1;
-    int64 accountId = 2; //用户标识
+    string accountId = 2; //用户标识
     int64 companyId = 3; //用户标识
     string resourceType = 4;
     int64 exportNum = 5;
@@ -64,7 +64,7 @@ message ConsumeRecord {
 
 
 message ResourcesReq {
-    int64 accountId = 1;
+    string accountId = 1;
 }
 
 //根据账户标识查询资源权限请求参数

+ 29 - 29
rpc/resourcesCenter/resourcesCenter.pb.go

@@ -90,7 +90,7 @@ type Balance struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AccountId    int64  `protobuf:"varint,1,opt,name=accountId,proto3" json:"accountId,omitempty"`       //账户标识
+	AccountId    string `protobuf:"bytes,1,opt,name=accountId,proto3" json:"accountId,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"` //组织标识
 	Name         string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`                  //资源名称
@@ -133,11 +133,11 @@ func (*Balance) Descriptor() ([]byte, []int) {
 	return file_resourcesCenter_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *Balance) GetAccountId() int64 {
+func (x *Balance) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 func (x *Balance) GetCompanyId() int64 {
@@ -201,7 +201,7 @@ type Detailed struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AccountId     int64  `protobuf:"varint,1,opt,name=accountId,proto3" json:"accountId,omitempty"`        //账户标识
+	AccountId     string `protobuf:"bytes,1,opt,name=accountId,proto3" json:"accountId,omitempty"`         //账户标识
 	CompanyId     int64  `protobuf:"varint,2,opt,name=companyId,proto3" json:"companyId,omitempty"`        //企业标识
 	ResourceType  string `protobuf:"bytes,3,opt,name=resourceType,proto3" json:"resourceType,omitempty"`   //资源类型
 	ExportNum     int64  `protobuf:"varint,4,opt,name=exportNum,proto3" json:"exportNum,omitempty"`        //导出数量
@@ -245,11 +245,11 @@ func (*Detailed) Descriptor() ([]byte, []int) {
 	return file_resourcesCenter_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Detailed) GetAccountId() int64 {
+func (x *Detailed) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 func (x *Detailed) GetCompanyId() int64 {
@@ -320,12 +320,12 @@ type ResourcesAuth struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	AccountId   int64 `protobuf:"varint,2,opt,name=accountId,proto3" json:"accountId,omitempty"`     //账户标识
-	ResourcesId int64 `protobuf:"varint,3,opt,name=resourcesId,proto3" json:"resourcesId,omitempty"` //资源标识
-	Quota       int64 `protobuf:"varint,4,opt,name=quota,proto3" json:"quota,omitempty"`             //定额
-	Ratio       int64 `protobuf:"varint,5,opt,name=ratio,proto3" json:"ratio,omitempty"`             //比例
-	State       int64 `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"`             //状态
+	Id          int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	AccountId   string `protobuf:"bytes,2,opt,name=accountId,proto3" json:"accountId,omitempty"`      //账户标识
+	ResourcesId int64  `protobuf:"varint,3,opt,name=resourcesId,proto3" json:"resourcesId,omitempty"` //资源标识
+	Quota       int64  `protobuf:"varint,4,opt,name=quota,proto3" json:"quota,omitempty"`             //定额
+	Ratio       int64  `protobuf:"varint,5,opt,name=ratio,proto3" json:"ratio,omitempty"`             //比例
+	State       int64  `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"`             //状态
 }
 
 func (x *ResourcesAuth) Reset() {
@@ -367,11 +367,11 @@ func (x *ResourcesAuth) GetId() int64 {
 	return 0
 }
 
-func (x *ResourcesAuth) GetAccountId() int64 {
+func (x *ResourcesAuth) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 func (x *ResourcesAuth) GetResourcesId() int64 {
@@ -408,7 +408,7 @@ type ResourceBalance struct {
 	unknownFields protoimpl.UnknownFields
 
 	Id           int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	AccountId    int64  `protobuf:"varint,2,opt,name=accountId,proto3" json:"accountId,omitempty"`      //人员标识
+	AccountId    string `protobuf:"bytes,2,opt,name=accountId,proto3" json:"accountId,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"` //资源代码
@@ -454,11 +454,11 @@ func (x *ResourceBalance) GetId() int64 {
 	return 0
 }
 
-func (x *ResourceBalance) GetAccountId() int64 {
+func (x *ResourceBalance) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 func (x *ResourceBalance) GetName() string {
@@ -495,7 +495,7 @@ type ConsumeRecord struct {
 	unknownFields protoimpl.UnknownFields
 
 	Id            int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	AccountId     int64  `protobuf:"varint,2,opt,name=accountId,proto3" json:"accountId,omitempty"` //用户标识
+	AccountId     string `protobuf:"bytes,2,opt,name=accountId,proto3" json:"accountId,omitempty"`  //用户标识
 	CompanyId     int64  `protobuf:"varint,3,opt,name=companyId,proto3" json:"companyId,omitempty"` //用户标识
 	ResourceType  string `protobuf:"bytes,4,opt,name=resourceType,proto3" json:"resourceType,omitempty"`
 	ExportNum     int64  `protobuf:"varint,5,opt,name=exportNum,proto3" json:"exportNum,omitempty"`
@@ -546,11 +546,11 @@ func (x *ConsumeRecord) GetId() int64 {
 	return 0
 }
 
-func (x *ConsumeRecord) GetAccountId() int64 {
+func (x *ConsumeRecord) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 func (x *ConsumeRecord) GetCompanyId() int64 {
@@ -621,7 +621,7 @@ type ResourcesReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AccountId int64 `protobuf:"varint,1,opt,name=accountId,proto3" json:"accountId,omitempty"`
+	AccountId string `protobuf:"bytes,1,opt,name=accountId,proto3" json:"accountId,omitempty"`
 }
 
 func (x *ResourcesReq) Reset() {
@@ -656,11 +656,11 @@ func (*ResourcesReq) Descriptor() ([]byte, []int) {
 	return file_resourcesCenter_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *ResourcesReq) GetAccountId() int64 {
+func (x *ResourcesReq) GetAccountId() string {
 	if x != nil {
 		return x.AccountId
 	}
-	return 0
+	return ""
 }
 
 //根据账户标识查询资源权限请求参数
@@ -866,7 +866,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
 	0x67, 0x65, 0x22, 0xf9, 0x01, 0x0a, 0x07, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 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, 0x12, 0x1c, 0x0a, 0x09,
+	0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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,
@@ -881,7 +881,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65,
 	0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0xbe,
 	0x02, 0x0a, 0x08, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
 	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x72, 0x65, 0x73, 0x6f, 0x75,
@@ -903,7 +903,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0xa1, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74,
 	0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
 	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12,
 	0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x49, 0x64, 0x18, 0x03,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x49,
 	0x64, 0x12, 0x14, 0x0a, 0x05, 0x71, 0x75, 0x6f, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
@@ -913,7 +913,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x61, 0x74, 0x65, 0x22, 0xa3, 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, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f,
+	0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f,
 	0x75, 0x6e, 0x74, 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,
@@ -923,7 +923,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0xd3, 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, 0x1c, 0x0a, 0x09, 0x61,
-	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
 	0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d,
 	0x70, 0x61, 0x6e, 0x79, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6f,
 	0x6d, 0x70, 0x61, 0x6e, 0x79, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x75,
@@ -944,7 +944,7 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 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,
+	0x28, 0x09, 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,

+ 3 - 3
rpc/resourcesCenterclient/resourcescenter.go

@@ -15,15 +15,15 @@ import (
 
 type (
 	Balance           = resourcesCenter.Balance
-	ResourceBalance   = resourcesCenter.ResourceBalance
+	ResourcesAuth     = resourcesCenter.ResourcesAuth
 	ResourcesAuthRes  = resourcesCenter.ResourcesAuthRes
+	AccountBalanceRes = resourcesCenter.AccountBalanceRes
 	ConsumeRecordRes  = resourcesCenter.ConsumeRecordRes
 	Response          = resourcesCenter.Response
 	Detailed          = resourcesCenter.Detailed
-	ResourcesAuth     = resourcesCenter.ResourcesAuth
+	ResourceBalance   = resourcesCenter.ResourceBalance
 	ConsumeRecord     = resourcesCenter.ConsumeRecord
 	ResourcesReq      = resourcesCenter.ResourcesReq
-	AccountBalanceRes = resourcesCenter.AccountBalanceRes
 
 	ResourcesCenter interface {
 		// 查询账户资源权限

+ 0 - 5
service/resourceManageService.go

@@ -3,7 +3,6 @@ package service
 import (
 	"app.yhyue.com/moapp/jyResourcesCenter/entity"
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
-	"log"
 )
 
 type ResourceManageService struct{}
@@ -19,7 +18,6 @@ func (service *ResourceManageService) FindResourcesAuth(data *resourcesCenter.Re
 		return authList, err
 	}
 	for _, v := range authArr {
-		log.Println("=======",v)
 		rb := &resourcesCenter.ResourceBalance{
 			Id:           v.Id,
 			AccountId:    v.AccountId,
@@ -28,9 +26,6 @@ func (service *ResourceManageService) FindResourcesAuth(data *resourcesCenter.Re
 			Number:       v.Number,
 			Spec:         v.Spec,
 		}
-		if v.Number == 0 {
-			rb.Number = int64(0)
-		}
 		authList = append(authList, rb)
 	}
 	return authList, nil