Explorar o código

扣费新增参数source

jianghan hai 6 meses
pai
achega
c26c225799

+ 8 - 7
rpc/internal/server/resourcescenterserver.go

@@ -1,4 +1,5 @@
-// Code generated by goctl. DO NOT EDIT!
+// Code generated by goctl. DO NOT EDIT.
+// goctl 1.7.6
 // Source: resourcesCenter.proto
 
 package server
@@ -70,37 +71,37 @@ func (s *ResourcesCenterServer) UpdateVipTime(ctx context.Context, in *resources
 	return l.UpdateVipTime(in)
 }
 
-//  新增资源数量
+// 新增资源数量
 func (s *ResourcesCenterServer) EntSourceNumAdd(ctx context.Context, in *resourcesCenter.EntSourceNumAddReq) (*resourcesCenter.Response, error) {
 	l := logic.NewEntSourceNumAddLogic(ctx, s.svcCtx)
 	return l.EntSourceNumAdd(in)
 }
 
-//  新增权益账号
+// 新增权益账号
 func (s *ResourcesCenterServer) EntAccountAdd(ctx context.Context, in *resourcesCenter.EntAccountAddReq) (*resourcesCenter.Response, error) {
 	l := logic.NewEntAccountAddLogic(ctx, s.svcCtx)
 	return l.EntAccountAdd(in)
 }
 
-//  权益分配
+// 权益分配
 func (s *ResourcesCenterServer) EntAccountGiven(ctx context.Context, in *resourcesCenter.EntOperateReq) (*resourcesCenter.Response, error) {
 	l := logic.NewEntAccountGivenLogic(ctx, s.svcCtx)
 	return l.EntAccountGiven(in)
 }
 
-//  权益收回
+// 权益收回
 func (s *ResourcesCenterServer) EntAccountRecovery(ctx context.Context, in *resourcesCenter.EntOperateReq) (*resourcesCenter.Response, error) {
 	l := logic.NewEntAccountRecoveryLogic(ctx, s.svcCtx)
 	return l.EntAccountRecovery(in)
 }
 
-//  剑鱼定制导出扣费方式
+// 剑鱼定制导出扣费方式
 func (s *ResourcesCenterServer) JyExportChargeAmount(ctx context.Context, in *resourcesCenter.ChargeAccountReq) (*resourcesCenter.ChargeResp, error) {
 	l := logic.NewJyExportChargeAmountLogic(ctx, s.svcCtx)
 	return l.JyExportChargeAmount(in)
 }
 
-//  剑鱼定制导出数据扣费
+// 剑鱼定制导出数据扣费
 func (s *ResourcesCenterServer) JyExportCharge(ctx context.Context, in *resourcesCenter.ChargeReq) (*resourcesCenter.ChargeResp, error) {
 	l := logic.NewJyExportChargeLogic(ctx, s.svcCtx)
 	return l.JyExportCharge(in)

+ 1 - 0
rpc/resourcesCenter.proto

@@ -214,6 +214,7 @@ message ChargeReq {
   int64 deductNum = 5;
   int32 chargeType = 6;  //扣费方式,0: 企业,1: 个人
   string remark = 7; // 备注
+  int32 source = 8; // 0: 自助导出,1: 定制导出
 }
 
 message ChargeResp {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 277 - 339
rpc/resourcesCenter/resourcesCenter.pb.go


+ 94 - 52
rpc/resourcesCenter/resourcesCenter_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.20.0--rc2
+// - protoc-gen-go-grpc v1.5.1
+// - protoc             v5.29.3
 // source: resourcesCenter.proto
 
 package resourcesCenter
@@ -15,28 +15,45 @@ import (
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
+// Requires gRPC-Go v1.64.0 or later.
+const _ = grpc.SupportPackageIsVersion8
+
+const (
+	ResourcesCenter_FindResourcesAuth_FullMethodName    = "/resourcesCenter.ResourcesCenter/findResourcesAuth"
+	ResourcesCenter_FindAccountBalance_FullMethodName   = "/resourcesCenter.ResourcesCenter/findAccountBalance"
+	ResourcesCenter_FindConsumeRecord_FullMethodName    = "/resourcesCenter.ResourcesCenter/findConsumeRecord"
+	ResourcesCenter_PurchaseUserBalance_FullMethodName  = "/resourcesCenter.ResourcesCenter/purchaseUserBalance"
+	ResourcesCenter_UseUserDetailed_FullMethodName      = "/resourcesCenter.ResourcesCenter/useUserDetailed"
+	ResourcesCenter_FindPreview_FullMethodName          = "/resourcesCenter.ResourcesCenter/findPreview"
+	ResourcesCenter_UserMerge_FullMethodName            = "/resourcesCenter.ResourcesCenter/userMerge"
+	ResourcesCenter_UpdateVipTime_FullMethodName        = "/resourcesCenter.ResourcesCenter/updateVipTime"
+	ResourcesCenter_EntSourceNumAdd_FullMethodName      = "/resourcesCenter.ResourcesCenter/entSourceNumAdd"
+	ResourcesCenter_EntAccountAdd_FullMethodName        = "/resourcesCenter.ResourcesCenter/entAccountAdd"
+	ResourcesCenter_EntAccountGiven_FullMethodName      = "/resourcesCenter.ResourcesCenter/entAccountGiven"
+	ResourcesCenter_EntAccountRecovery_FullMethodName   = "/resourcesCenter.ResourcesCenter/entAccountRecovery"
+	ResourcesCenter_JyExportChargeAmount_FullMethodName = "/resourcesCenter.ResourcesCenter/jyExportChargeAmount"
+	ResourcesCenter_JyExportCharge_FullMethodName       = "/resourcesCenter.ResourcesCenter/jyExportCharge"
+)
 
 // ResourcesCenterClient is the client API for ResourcesCenter service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type ResourcesCenterClient interface {
-	//查询账户资源权限
+	// 查询账户资源权限
 	FindResourcesAuth(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error)
-	//查询账户资源余额
+	// 查询账户资源余额
 	FindAccountBalance(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error)
-	//查询流水账
+	// 查询流水账
 	FindConsumeRecord(ctx context.Context, in *RecordReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error)
-	//根据账户标识购买资源
+	// 根据账户标识购买资源
 	PurchaseUserBalance(ctx context.Context, in *Resources, opts ...grpc.CallOption) (*Response, error)
-	//根据账户标识使用资源
+	// 根据账户标识使用资源
 	UseUserDetailed(ctx context.Context, in *Resources, opts ...grpc.CallOption) (*UseUserResponse, error)
-	//预览信息
+	// 预览信息
 	FindPreview(ctx context.Context, in *PreviewReq, opts ...grpc.CallOption) (*PreviewRes, error)
-	//合并账号
+	// 合并账号
 	UserMerge(ctx context.Context, in *MergeInfo, opts ...grpc.CallOption) (*Response, error)
-	//超级订阅时间修改
+	// 超级订阅时间修改
 	UpdateVipTime(ctx context.Context, in *VipReq, opts ...grpc.CallOption) (*Response, error)
 	// 新增资源数量
 	EntSourceNumAdd(ctx context.Context, in *EntSourceNumAddReq, opts ...grpc.CallOption) (*Response, error)
@@ -61,8 +78,9 @@ func NewResourcesCenterClient(cc grpc.ClientConnInterface) ResourcesCenterClient
 }
 
 func (c *resourcesCenterClient) FindResourcesAuth(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(AccountBalanceRes)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findResourcesAuth", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_FindResourcesAuth_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -70,8 +88,9 @@ func (c *resourcesCenterClient) FindResourcesAuth(ctx context.Context, in *Resou
 }
 
 func (c *resourcesCenterClient) FindAccountBalance(ctx context.Context, in *ResourcesReq, opts ...grpc.CallOption) (*AccountBalanceRes, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(AccountBalanceRes)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findAccountBalance", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_FindAccountBalance_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -79,8 +98,9 @@ func (c *resourcesCenterClient) FindAccountBalance(ctx context.Context, in *Reso
 }
 
 func (c *resourcesCenterClient) FindConsumeRecord(ctx context.Context, in *RecordReq, opts ...grpc.CallOption) (*ConsumeRecordRes, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(ConsumeRecordRes)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findConsumeRecord", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_FindConsumeRecord_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -88,8 +108,9 @@ func (c *resourcesCenterClient) FindConsumeRecord(ctx context.Context, in *Recor
 }
 
 func (c *resourcesCenterClient) PurchaseUserBalance(ctx context.Context, in *Resources, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/purchaseUserBalance", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_PurchaseUserBalance_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -97,8 +118,9 @@ func (c *resourcesCenterClient) PurchaseUserBalance(ctx context.Context, in *Res
 }
 
 func (c *resourcesCenterClient) UseUserDetailed(ctx context.Context, in *Resources, opts ...grpc.CallOption) (*UseUserResponse, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(UseUserResponse)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/useUserDetailed", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_UseUserDetailed_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -106,8 +128,9 @@ func (c *resourcesCenterClient) UseUserDetailed(ctx context.Context, in *Resourc
 }
 
 func (c *resourcesCenterClient) FindPreview(ctx context.Context, in *PreviewReq, opts ...grpc.CallOption) (*PreviewRes, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(PreviewRes)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/findPreview", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_FindPreview_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -115,8 +138,9 @@ func (c *resourcesCenterClient) FindPreview(ctx context.Context, in *PreviewReq,
 }
 
 func (c *resourcesCenterClient) UserMerge(ctx context.Context, in *MergeInfo, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/userMerge", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_UserMerge_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -124,8 +148,9 @@ func (c *resourcesCenterClient) UserMerge(ctx context.Context, in *MergeInfo, op
 }
 
 func (c *resourcesCenterClient) UpdateVipTime(ctx context.Context, in *VipReq, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/updateVipTime", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_UpdateVipTime_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -133,8 +158,9 @@ func (c *resourcesCenterClient) UpdateVipTime(ctx context.Context, in *VipReq, o
 }
 
 func (c *resourcesCenterClient) EntSourceNumAdd(ctx context.Context, in *EntSourceNumAddReq, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/entSourceNumAdd", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_EntSourceNumAdd_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -142,8 +168,9 @@ func (c *resourcesCenterClient) EntSourceNumAdd(ctx context.Context, in *EntSour
 }
 
 func (c *resourcesCenterClient) EntAccountAdd(ctx context.Context, in *EntAccountAddReq, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/entAccountAdd", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_EntAccountAdd_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -151,8 +178,9 @@ func (c *resourcesCenterClient) EntAccountAdd(ctx context.Context, in *EntAccoun
 }
 
 func (c *resourcesCenterClient) EntAccountGiven(ctx context.Context, in *EntOperateReq, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/entAccountGiven", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_EntAccountGiven_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -160,8 +188,9 @@ func (c *resourcesCenterClient) EntAccountGiven(ctx context.Context, in *EntOper
 }
 
 func (c *resourcesCenterClient) EntAccountRecovery(ctx context.Context, in *EntOperateReq, opts ...grpc.CallOption) (*Response, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/entAccountRecovery", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_EntAccountRecovery_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -169,8 +198,9 @@ func (c *resourcesCenterClient) EntAccountRecovery(ctx context.Context, in *EntO
 }
 
 func (c *resourcesCenterClient) JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(ChargeResp)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/jyExportChargeAmount", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_JyExportChargeAmount_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -178,8 +208,9 @@ func (c *resourcesCenterClient) JyExportChargeAmount(ctx context.Context, in *Ch
 }
 
 func (c *resourcesCenterClient) JyExportCharge(ctx context.Context, in *ChargeReq, opts ...grpc.CallOption) (*ChargeResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(ChargeResp)
-	err := c.cc.Invoke(ctx, "/resourcesCenter.ResourcesCenter/jyExportCharge", in, out, opts...)
+	err := c.cc.Invoke(ctx, ResourcesCenter_JyExportCharge_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -188,23 +219,23 @@ func (c *resourcesCenterClient) JyExportCharge(ctx context.Context, in *ChargeRe
 
 // ResourcesCenterServer is the server API for ResourcesCenter service.
 // All implementations must embed UnimplementedResourcesCenterServer
-// for forward compatibility
+// for forward compatibility.
 type ResourcesCenterServer interface {
-	//查询账户资源权限
+	// 查询账户资源权限
 	FindResourcesAuth(context.Context, *ResourcesReq) (*AccountBalanceRes, error)
-	//查询账户资源余额
+	// 查询账户资源余额
 	FindAccountBalance(context.Context, *ResourcesReq) (*AccountBalanceRes, error)
-	//查询流水账
+	// 查询流水账
 	FindConsumeRecord(context.Context, *RecordReq) (*ConsumeRecordRes, error)
-	//根据账户标识购买资源
+	// 根据账户标识购买资源
 	PurchaseUserBalance(context.Context, *Resources) (*Response, error)
-	//根据账户标识使用资源
+	// 根据账户标识使用资源
 	UseUserDetailed(context.Context, *Resources) (*UseUserResponse, error)
-	//预览信息
+	// 预览信息
 	FindPreview(context.Context, *PreviewReq) (*PreviewRes, error)
-	//合并账号
+	// 合并账号
 	UserMerge(context.Context, *MergeInfo) (*Response, error)
-	//超级订阅时间修改
+	// 超级订阅时间修改
 	UpdateVipTime(context.Context, *VipReq) (*Response, error)
 	// 新增资源数量
 	EntSourceNumAdd(context.Context, *EntSourceNumAddReq) (*Response, error)
@@ -221,9 +252,12 @@ type ResourcesCenterServer interface {
 	mustEmbedUnimplementedResourcesCenterServer()
 }
 
-// UnimplementedResourcesCenterServer must be embedded to have forward compatible implementations.
-type UnimplementedResourcesCenterServer struct {
-}
+// UnimplementedResourcesCenterServer must be embedded to have
+// forward compatible implementations.
+//
+// NOTE: this should be embedded by value instead of pointer to avoid a nil
+// pointer dereference when methods are called.
+type UnimplementedResourcesCenterServer struct{}
 
 func (UnimplementedResourcesCenterServer) FindResourcesAuth(context.Context, *ResourcesReq) (*AccountBalanceRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindResourcesAuth not implemented")
@@ -268,6 +302,7 @@ func (UnimplementedResourcesCenterServer) JyExportCharge(context.Context, *Charg
 	return nil, status.Errorf(codes.Unimplemented, "method JyExportCharge not implemented")
 }
 func (UnimplementedResourcesCenterServer) mustEmbedUnimplementedResourcesCenterServer() {}
+func (UnimplementedResourcesCenterServer) testEmbeddedByValue()                         {}
 
 // UnsafeResourcesCenterServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to ResourcesCenterServer will
@@ -277,6 +312,13 @@ type UnsafeResourcesCenterServer interface {
 }
 
 func RegisterResourcesCenterServer(s grpc.ServiceRegistrar, srv ResourcesCenterServer) {
+	// If the following call pancis, it indicates UnimplementedResourcesCenterServer was
+	// embedded by pointer and is nil.  This will cause panics if an
+	// unimplemented method is ever invoked, so we test this at initialization
+	// time to prevent it from happening at runtime later due to I/O.
+	if t, ok := srv.(interface{ testEmbeddedByValue() }); ok {
+		t.testEmbeddedByValue()
+	}
 	s.RegisterService(&ResourcesCenter_ServiceDesc, srv)
 }
 
@@ -290,7 +332,7 @@ func _ResourcesCenter_FindResourcesAuth_Handler(srv interface{}, ctx context.Con
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/findResourcesAuth",
+		FullMethod: ResourcesCenter_FindResourcesAuth_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).FindResourcesAuth(ctx, req.(*ResourcesReq))
@@ -308,7 +350,7 @@ func _ResourcesCenter_FindAccountBalance_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/findAccountBalance",
+		FullMethod: ResourcesCenter_FindAccountBalance_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).FindAccountBalance(ctx, req.(*ResourcesReq))
@@ -326,7 +368,7 @@ func _ResourcesCenter_FindConsumeRecord_Handler(srv interface{}, ctx context.Con
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/findConsumeRecord",
+		FullMethod: ResourcesCenter_FindConsumeRecord_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).FindConsumeRecord(ctx, req.(*RecordReq))
@@ -344,7 +386,7 @@ func _ResourcesCenter_PurchaseUserBalance_Handler(srv interface{}, ctx context.C
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/purchaseUserBalance",
+		FullMethod: ResourcesCenter_PurchaseUserBalance_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).PurchaseUserBalance(ctx, req.(*Resources))
@@ -362,7 +404,7 @@ func _ResourcesCenter_UseUserDetailed_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/useUserDetailed",
+		FullMethod: ResourcesCenter_UseUserDetailed_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).UseUserDetailed(ctx, req.(*Resources))
@@ -380,7 +422,7 @@ func _ResourcesCenter_FindPreview_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/findPreview",
+		FullMethod: ResourcesCenter_FindPreview_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).FindPreview(ctx, req.(*PreviewReq))
@@ -398,7 +440,7 @@ func _ResourcesCenter_UserMerge_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/userMerge",
+		FullMethod: ResourcesCenter_UserMerge_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).UserMerge(ctx, req.(*MergeInfo))
@@ -416,7 +458,7 @@ func _ResourcesCenter_UpdateVipTime_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/updateVipTime",
+		FullMethod: ResourcesCenter_UpdateVipTime_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).UpdateVipTime(ctx, req.(*VipReq))
@@ -434,7 +476,7 @@ func _ResourcesCenter_EntSourceNumAdd_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/entSourceNumAdd",
+		FullMethod: ResourcesCenter_EntSourceNumAdd_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).EntSourceNumAdd(ctx, req.(*EntSourceNumAddReq))
@@ -452,7 +494,7 @@ func _ResourcesCenter_EntAccountAdd_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/entAccountAdd",
+		FullMethod: ResourcesCenter_EntAccountAdd_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).EntAccountAdd(ctx, req.(*EntAccountAddReq))
@@ -470,7 +512,7 @@ func _ResourcesCenter_EntAccountGiven_Handler(srv interface{}, ctx context.Conte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/entAccountGiven",
+		FullMethod: ResourcesCenter_EntAccountGiven_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).EntAccountGiven(ctx, req.(*EntOperateReq))
@@ -488,7 +530,7 @@ func _ResourcesCenter_EntAccountRecovery_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/entAccountRecovery",
+		FullMethod: ResourcesCenter_EntAccountRecovery_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).EntAccountRecovery(ctx, req.(*EntOperateReq))
@@ -506,7 +548,7 @@ func _ResourcesCenter_JyExportChargeAmount_Handler(srv interface{}, ctx context.
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/jyExportChargeAmount",
+		FullMethod: ResourcesCenter_JyExportChargeAmount_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).JyExportChargeAmount(ctx, req.(*ChargeAccountReq))
@@ -524,7 +566,7 @@ func _ResourcesCenter_JyExportCharge_Handler(srv interface{}, ctx context.Contex
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/resourcesCenter.ResourcesCenter/jyExportCharge",
+		FullMethod: ResourcesCenter_JyExportCharge_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(ResourcesCenterServer).JyExportCharge(ctx, req.(*ChargeReq))

+ 1 - 0
rpc/resourcesCenterclient/resourcescenter.go

@@ -1,4 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
+// goctl 1.7.6
 // Source: resourcesCenter.proto
 
 package resourcesCenterclient

+ 2 - 2
service/exportChargeService.go

@@ -187,7 +187,7 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 			AccountType:   1,
 			EntId:         data.EntId,
 			EntUserId:     data.EntUserId,
-			Source:        1,
+			Source:        int(data.Source),
 		}
 		if detailed.EntUserId > 0 {
 			jyOrm.Table("entniche_user").Select("CONCAT(NAME,'(',phone,')')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)
@@ -290,7 +290,7 @@ func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.Charge
 			AccountType:   1,
 			EntId:         data.EntId,
 			EntUserId:     data.EntUserId,
-			Source:        1,
+			Source:        int(data.Source),
 		}
 		if detailed.EntUserId > 0 {
 			jyOrm.Table("entniche_user").Select("CONCAT(NAME,'(',phone,')')").Where("id=?", detailed.EntUserId).Get(&detailed.Operator)

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio