Merge branch 'dev' of http://gitea-inner.fontree.cn/fiee/fonchain-fiee into dev
This commit is contained in:
		
						commit
						3f43441c4f
					
				
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,8 +1,8 @@ | ||||
| // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 | ||||
| // versions:
 | ||||
| // - protoc-gen-go-triple v1.0.8
 | ||||
| // - protoc             v4.22.0--rc2
 | ||||
| // source: accountFiee.proto
 | ||||
| // - protoc             v4.24.0--rc1
 | ||||
| // source: api/accountFiee/accountFiee.proto
 | ||||
| 
 | ||||
| package accountFiee | ||||
| 
 | ||||
| @ -35,7 +35,7 @@ type AccountFieeClient interface { | ||||
| 	OnlineLog(ctx context.Context, in *LoginInfosByUserIdRequest, opts ...grpc_go.CallOption) (*LoginLogsResponse, common.ErrorWithAttachment) | ||||
| 	OnlineLogById(ctx context.Context, in *OnlineLogByIdRequest, opts ...grpc_go.CallOption) (*LoginLog, common.ErrorWithAttachment) | ||||
| 	CheckPwd(ctx context.Context, in *CheckPwdRequest, opts ...grpc_go.CallOption) (*UpdateResponse, common.ErrorWithAttachment) | ||||
| 	// rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 | ||||
| 	//  rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 | ||||
| 	SendMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment) | ||||
| 	SendCustomMsg(ctx context.Context, in *SendCustomMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment) | ||||
| 	SendExCustomMsg(ctx context.Context, in *SendCustomMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment) | ||||
| @ -70,7 +70,7 @@ type AccountFieeClient interface { | ||||
| 	VerifySliderStatus(ctx context.Context, in *VerifySliderStatusRequest, opts ...grpc_go.CallOption) (*VerifySliderStatusResponse, common.ErrorWithAttachment) | ||||
| 	// submit info
 | ||||
| 	SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) | ||||
| 	// -----------------------------客服聊天系统--------------------------------
 | ||||
| 	//-----------------------------客服聊天系统--------------------------------
 | ||||
| 	CreateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CreateChatUserResp, common.ErrorWithAttachment) | ||||
| 	UpdateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment) | ||||
| 	SaveChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment) | ||||
| @ -591,7 +591,7 @@ type AccountFieeServer interface { | ||||
| 	OnlineLog(context.Context, *LoginInfosByUserIdRequest) (*LoginLogsResponse, error) | ||||
| 	OnlineLogById(context.Context, *OnlineLogByIdRequest) (*LoginLog, error) | ||||
| 	CheckPwd(context.Context, *CheckPwdRequest) (*UpdateResponse, error) | ||||
| 	// rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 | ||||
| 	//  rpc RegisterOrExist (RegistRequest) returns (RequestStatus) {}
 | ||||
| 	SendMsg(context.Context, *SendMsgRequest) (*SendMsgStatusResponse, error) | ||||
| 	SendCustomMsg(context.Context, *SendCustomMsgRequest) (*SendMsgStatusResponse, error) | ||||
| 	SendExCustomMsg(context.Context, *SendCustomMsgRequest) (*SendMsgStatusResponse, error) | ||||
| @ -626,7 +626,7 @@ type AccountFieeServer interface { | ||||
| 	VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error) | ||||
| 	// submit info
 | ||||
| 	SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error) | ||||
| 	// -----------------------------客服聊天系统--------------------------------
 | ||||
| 	//-----------------------------客服聊天系统--------------------------------
 | ||||
| 	CreateChatUser(context.Context, *ChatUserData) (*CreateChatUserResp, error) | ||||
| 	UpdateChatUser(context.Context, *ChatUserData) (*CommonMsg, error) | ||||
| 	SaveChatUser(context.Context, *ChatUserData) (*CommonMsg, error) | ||||
| @ -3074,5 +3074,5 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{ | ||||
| 		}, | ||||
| 	}, | ||||
| 	Streams:  []grpc_go.StreamDesc{}, | ||||
| 	Metadata: "accountFiee.proto", | ||||
| 	Metadata: "api/accountFiee/accountFiee.proto", | ||||
| } | ||||
|  | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -7,8 +7,8 @@ import ( | ||||
| 	fmt "fmt" | ||||
| 	math "math" | ||||
| 	proto "github.com/golang/protobuf/proto" | ||||
| 	_ "github.com/mwitkow/go-proto-validators" | ||||
| 	_ "google.golang.org/protobuf/types/descriptorpb" | ||||
| 	_ "github.com/mwitkow/go-proto-validators" | ||||
| 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators" | ||||
| ) | ||||
| 
 | ||||
| @ -17,6 +17,22 @@ var _ = proto.Marshal | ||||
| var _ = fmt.Errorf | ||||
| var _ = math.Inf | ||||
| 
 | ||||
| func (this *GetReconciliationListReq) Validate() error { | ||||
| 	return nil | ||||
| } | ||||
| func (this *GetReconciliationListResp) Validate() error { | ||||
| 	for _, item := range this.List { | ||||
| 		if item != nil { | ||||
| 			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil { | ||||
| 				return github_com_mwitkow_go_proto_validators.FieldError("List", err) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
| func (this *ReconciliationInfo) Validate() error { | ||||
| 	return nil | ||||
| } | ||||
| func (this *OrderInfoByOrderNoRequest) Validate() error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| @ -68,6 +68,10 @@ type BundleClient interface { | ||||
| 	GetImageWorkDetail(ctx context.Context, in *GetImageWorkDetailReq, opts ...grpc_go.CallOption) (*GetImageWorkDetailResp, common.ErrorWithAttachment) | ||||
| 	GetVedioWorkDetail(ctx context.Context, in *GetVedioWorkDetailReq, opts ...grpc_go.CallOption) (*GetVedioeWorkDetailResp, common.ErrorWithAttachment) | ||||
| 	ToBeComfirmedWorks(ctx context.Context, in *ToBeComfirmedWorksReq, opts ...grpc_go.CallOption) (*ToBeComfirmedWorksResp, common.ErrorWithAttachment) | ||||
| 	//对账单
 | ||||
| 	GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment) | ||||
| 	CreateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) | ||||
| 	UpdateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) | ||||
| } | ||||
| 
 | ||||
| type bundleClient struct { | ||||
| @ -111,6 +115,9 @@ type BundleClientImpl struct { | ||||
| 	GetImageWorkDetail                   func(ctx context.Context, in *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error) | ||||
| 	GetVedioWorkDetail                   func(ctx context.Context, in *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error) | ||||
| 	ToBeComfirmedWorks                   func(ctx context.Context, in *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error) | ||||
| 	GetReconciliationList                func(ctx context.Context, in *GetReconciliationListReq) (*GetReconciliationListResp, error) | ||||
| 	CreateReconciliation                 func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error) | ||||
| 	UpdateReconciliation                 func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error) | ||||
| } | ||||
| 
 | ||||
| func (c *BundleClientImpl) GetDubboStub(cc *triple.TripleConn) BundleClient { | ||||
| @ -341,6 +348,24 @@ func (c *bundleClient) ToBeComfirmedWorks(ctx context.Context, in *ToBeComfirmed | ||||
| 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ToBeComfirmedWorks", in, out) | ||||
| } | ||||
| 
 | ||||
| func (c *bundleClient) GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment) { | ||||
| 	out := new(GetReconciliationListResp) | ||||
| 	interfaceKey := ctx.Value(constant.InterfaceKey).(string) | ||||
| 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetReconciliationList", in, out) | ||||
| } | ||||
| 
 | ||||
| func (c *bundleClient) CreateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) { | ||||
| 	out := new(CommonResponse) | ||||
| 	interfaceKey := ctx.Value(constant.InterfaceKey).(string) | ||||
| 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CreateReconciliation", in, out) | ||||
| } | ||||
| 
 | ||||
| func (c *bundleClient) UpdateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) { | ||||
| 	out := new(CommonResponse) | ||||
| 	interfaceKey := ctx.Value(constant.InterfaceKey).(string) | ||||
| 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UpdateReconciliation", in, out) | ||||
| } | ||||
| 
 | ||||
| // BundleServer is the server API for Bundle service.
 | ||||
| // All implementations must embed UnimplementedBundleServer
 | ||||
| // for forward compatibility
 | ||||
| @ -385,6 +410,10 @@ type BundleServer interface { | ||||
| 	GetImageWorkDetail(context.Context, *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error) | ||||
| 	GetVedioWorkDetail(context.Context, *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error) | ||||
| 	ToBeComfirmedWorks(context.Context, *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error) | ||||
| 	//对账单
 | ||||
| 	GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error) | ||||
| 	CreateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error) | ||||
| 	UpdateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error) | ||||
| 	mustEmbedUnimplementedBundleServer() | ||||
| } | ||||
| 
 | ||||
| @ -501,6 +530,15 @@ func (UnimplementedBundleServer) GetVedioWorkDetail(context.Context, *GetVedioWo | ||||
| func (UnimplementedBundleServer) ToBeComfirmedWorks(context.Context, *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error) { | ||||
| 	return nil, status.Errorf(codes.Unimplemented, "method ToBeComfirmedWorks not implemented") | ||||
| } | ||||
| func (UnimplementedBundleServer) GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error) { | ||||
| 	return nil, status.Errorf(codes.Unimplemented, "method GetReconciliationList not implemented") | ||||
| } | ||||
| func (UnimplementedBundleServer) CreateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error) { | ||||
| 	return nil, status.Errorf(codes.Unimplemented, "method CreateReconciliation not implemented") | ||||
| } | ||||
| func (UnimplementedBundleServer) UpdateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error) { | ||||
| 	return nil, status.Errorf(codes.Unimplemented, "method UpdateReconciliation not implemented") | ||||
| } | ||||
| func (s *UnimplementedBundleServer) XXX_SetProxyImpl(impl protocol.Invoker) { | ||||
| 	s.proxyImpl = impl | ||||
| } | ||||
| @ -1573,6 +1611,93 @@ func _Bundle_ToBeComfirmedWorks_Handler(srv interface{}, ctx context.Context, de | ||||
| 	return interceptor(ctx, in, info, handler) | ||||
| } | ||||
| 
 | ||||
| func _Bundle_GetReconciliationList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { | ||||
| 	in := new(GetReconciliationListReq) | ||||
| 	if err := dec(in); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	base := srv.(dubbo3.Dubbo3GrpcService) | ||||
| 	args := []interface{}{} | ||||
| 	args = append(args, in) | ||||
| 	md, _ := metadata.FromIncomingContext(ctx) | ||||
| 	invAttachment := make(map[string]interface{}, len(md)) | ||||
| 	for k, v := range md { | ||||
| 		invAttachment[k] = v | ||||
| 	} | ||||
| 	invo := invocation.NewRPCInvocation("GetReconciliationList", args, invAttachment) | ||||
| 	if interceptor == nil { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	info := &grpc_go.UnaryServerInfo{ | ||||
| 		Server:     srv, | ||||
| 		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), | ||||
| 	} | ||||
| 	handler := func(ctx context.Context, req interface{}) (interface{}, error) { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	return interceptor(ctx, in, info, handler) | ||||
| } | ||||
| 
 | ||||
| func _Bundle_CreateReconciliation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { | ||||
| 	in := new(ReconciliationInfo) | ||||
| 	if err := dec(in); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	base := srv.(dubbo3.Dubbo3GrpcService) | ||||
| 	args := []interface{}{} | ||||
| 	args = append(args, in) | ||||
| 	md, _ := metadata.FromIncomingContext(ctx) | ||||
| 	invAttachment := make(map[string]interface{}, len(md)) | ||||
| 	for k, v := range md { | ||||
| 		invAttachment[k] = v | ||||
| 	} | ||||
| 	invo := invocation.NewRPCInvocation("CreateReconciliation", args, invAttachment) | ||||
| 	if interceptor == nil { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	info := &grpc_go.UnaryServerInfo{ | ||||
| 		Server:     srv, | ||||
| 		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), | ||||
| 	} | ||||
| 	handler := func(ctx context.Context, req interface{}) (interface{}, error) { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	return interceptor(ctx, in, info, handler) | ||||
| } | ||||
| 
 | ||||
| func _Bundle_UpdateReconciliation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { | ||||
| 	in := new(ReconciliationInfo) | ||||
| 	if err := dec(in); err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	base := srv.(dubbo3.Dubbo3GrpcService) | ||||
| 	args := []interface{}{} | ||||
| 	args = append(args, in) | ||||
| 	md, _ := metadata.FromIncomingContext(ctx) | ||||
| 	invAttachment := make(map[string]interface{}, len(md)) | ||||
| 	for k, v := range md { | ||||
| 		invAttachment[k] = v | ||||
| 	} | ||||
| 	invo := invocation.NewRPCInvocation("UpdateReconciliation", args, invAttachment) | ||||
| 	if interceptor == nil { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	info := &grpc_go.UnaryServerInfo{ | ||||
| 		Server:     srv, | ||||
| 		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), | ||||
| 	} | ||||
| 	handler := func(ctx context.Context, req interface{}) (interface{}, error) { | ||||
| 		result := base.XXX_GetProxyImpl().Invoke(ctx, invo) | ||||
| 		return result, result.Error() | ||||
| 	} | ||||
| 	return interceptor(ctx, in, info, handler) | ||||
| } | ||||
| 
 | ||||
| // Bundle_ServiceDesc is the grpc_go.ServiceDesc for Bundle service.
 | ||||
| // It's only intended for direct use with grpc_go.RegisterService,
 | ||||
| // and not to be introspected or modified (even as a copy)
 | ||||
| @ -1724,6 +1849,18 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{ | ||||
| 			MethodName: "ToBeComfirmedWorks", | ||||
| 			Handler:    _Bundle_ToBeComfirmedWorks_Handler, | ||||
| 		}, | ||||
| 		{ | ||||
| 			MethodName: "GetReconciliationList", | ||||
| 			Handler:    _Bundle_GetReconciliationList_Handler, | ||||
| 		}, | ||||
| 		{ | ||||
| 			MethodName: "CreateReconciliation", | ||||
| 			Handler:    _Bundle_CreateReconciliation_Handler, | ||||
| 		}, | ||||
| 		{ | ||||
| 			MethodName: "UpdateReconciliation", | ||||
| 			Handler:    _Bundle_UpdateReconciliation_Handler, | ||||
| 		}, | ||||
| 	}, | ||||
| 	Streams:  []grpc_go.StreamDesc{}, | ||||
| 	Metadata: "pb/bundle.proto", | ||||
|  | ||||
| @ -25,9 +25,9 @@ type IsSecFilingExistReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingDate string `protobuf:"bytes,1,opt,name=filingDate,proto3" json:"filingDate,omitempty"` | ||||
| 	Form       string `protobuf:"bytes,2,opt,name=form,proto3" json:"form,omitempty"` | ||||
| 	FinalLink  string `protobuf:"bytes,3,opt,name=finalLink,proto3" json:"finalLink,omitempty"` | ||||
| 	FilingDate string `protobuf:"bytes,1,opt,name=filingDate,proto3" json:"filingDate"` | ||||
| 	Form       string `protobuf:"bytes,2,opt,name=form,proto3" json:"form"` | ||||
| 	FinalLink  string `protobuf:"bytes,3,opt,name=finalLink,proto3" json:"finalLink"` | ||||
| } | ||||
| 
 | ||||
| func (x *IsSecFilingExistReq) Reset() { | ||||
| @ -86,7 +86,7 @@ type IsSecFilingExistResp struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Exist bool `protobuf:"varint,1,opt,name=exist,proto3" json:"exist,omitempty"` | ||||
| 	Exist bool `protobuf:"varint,1,opt,name=exist,proto3" json:"exist"` | ||||
| } | ||||
| 
 | ||||
| func (x *IsSecFilingExistResp) Reset() { | ||||
| @ -131,8 +131,8 @@ type CommonResp struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Msg       string `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` | ||||
| 	FilingKey string `protobuf:"bytes,2,opt,name=filingKey,json=filing_key,proto3" json:"filingKey,omitempty"` | ||||
| 	Msg       string `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg"` | ||||
| 	FilingKey string `protobuf:"bytes,2,opt,name=filingKey,json=filing_key,proto3" json:"filingKey"` | ||||
| } | ||||
| 
 | ||||
| func (x *CommonResp) Reset() { | ||||
| @ -184,22 +184,22 @@ type SecFiling struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Idx             int32        `protobuf:"varint,1,opt,name=idx,proto3" json:"idx,omitempty"` | ||||
| 	FilingKey       string       `protobuf:"bytes,2,opt,name=filingKey,json=filing_key,proto3" json:"filingKey,omitempty"` | ||||
| 	FilingDate      string       `protobuf:"bytes,3,opt,name=filingDate,json=filing_date,proto3" json:"filingDate,omitempty"` | ||||
| 	Form            string       `protobuf:"bytes,4,opt,name=form,proto3" json:"form,omitempty"` | ||||
| 	Description     string       `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` | ||||
| 	FormDescription string       `protobuf:"bytes,6,opt,name=formDescription,json=form_description,proto3" json:"formDescription,omitempty"` | ||||
| 	FileLink        string       `protobuf:"bytes,7,opt,name=fileLink,json=file_link,proto3" json:"fileLink,omitempty"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,8,rep,name=dataFiles,json=data_files,proto3" json:"dataFiles,omitempty"` | ||||
| 	PdfFile         string       `protobuf:"bytes,9,opt,name=pdfFile,json=pdf_file,proto3" json:"pdfFile,omitempty"` | ||||
| 	WordFile        string       `protobuf:"bytes,10,opt,name=wordFile,json=word_file,proto3" json:"wordFile,omitempty"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,11,opt,name=excelFile,json=excel_file,proto3" json:"excelFile,omitempty"` | ||||
| 	Status          int32        `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"` | ||||
| 	Operator        string       `protobuf:"bytes,13,opt,name=operator,proto3" json:"operator,omitempty"` | ||||
| 	OperatorId      int32        `protobuf:"varint,14,opt,name=operatorId,json=operator_id,proto3" json:"operatorId,omitempty"` | ||||
| 	CreatedAt       string       `protobuf:"bytes,15,opt,name=createdAt,json=created_at,proto3" json:"createdAt,omitempty"` | ||||
| 	UpdatedAt       string       `protobuf:"bytes,16,opt,name=updatedAt,json=updated_at,proto3" json:"updatedAt,omitempty"` | ||||
| 	Idx             int32        `protobuf:"varint,1,opt,name=idx,proto3" json:"idx"` | ||||
| 	FilingKey       string       `protobuf:"bytes,2,opt,name=filingKey,json=filing_key,proto3" json:"filingKey"` | ||||
| 	FilingDate      string       `protobuf:"bytes,3,opt,name=filingDate,json=filing_date,proto3" json:"filingDate"` | ||||
| 	Form            string       `protobuf:"bytes,4,opt,name=form,proto3" json:"form"` | ||||
| 	Description     string       `protobuf:"bytes,5,opt,name=description,proto3" json:"description"` | ||||
| 	FormDescription string       `protobuf:"bytes,6,opt,name=formDescription,json=form_description,proto3" json:"formDescription"` | ||||
| 	FileLink        string       `protobuf:"bytes,7,opt,name=fileLink,json=file_link,proto3" json:"fileLink"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,8,rep,name=dataFiles,json=data_files,proto3" json:"dataFiles"` | ||||
| 	PdfFile         string       `protobuf:"bytes,9,opt,name=pdfFile,json=pdf_file,proto3" json:"pdfFile"` | ||||
| 	WordFile        string       `protobuf:"bytes,10,opt,name=wordFile,json=word_file,proto3" json:"wordFile"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,11,opt,name=excelFile,json=excel_file,proto3" json:"excelFile"` | ||||
| 	Status          int32        `protobuf:"varint,12,opt,name=status,proto3" json:"status"` | ||||
| 	Operator        string       `protobuf:"bytes,13,opt,name=operator,proto3" json:"operator"` | ||||
| 	OperatorId      int32        `protobuf:"varint,14,opt,name=operatorId,json=operator_id,proto3" json:"operatorId"` | ||||
| 	CreatedAt       string       `protobuf:"bytes,15,opt,name=createdAt,json=created_at,proto3" json:"createdAt"` | ||||
| 	UpdatedAt       string       `protobuf:"bytes,16,opt,name=updatedAt,json=updated_at,proto3" json:"updatedAt"` | ||||
| } | ||||
| 
 | ||||
| func (x *SecFiling) Reset() { | ||||
| @ -349,8 +349,8 @@ type DataFiles struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` | ||||
| 	FileUrl     string `protobuf:"bytes,2,opt,name=fileUrl,json=file_url,proto3" json:"fileUrl,omitempty"` | ||||
| 	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description"` | ||||
| 	FileUrl     string `protobuf:"bytes,2,opt,name=fileUrl,json=file_url,proto3" json:"fileUrl"` | ||||
| } | ||||
| 
 | ||||
| func (x *DataFiles) Reset() { | ||||
| @ -402,17 +402,17 @@ type CreateSecFilingReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingDate      string       `protobuf:"bytes,1,opt,name=filingDate,proto3" json:"filingDate,omitempty"` | ||||
| 	Form            string       `protobuf:"bytes,2,opt,name=form,proto3" json:"form,omitempty"` | ||||
| 	Description     string       `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` | ||||
| 	FormDescription string       `protobuf:"bytes,4,opt,name=formDescription,proto3" json:"formDescription,omitempty"` | ||||
| 	FileLink        string       `protobuf:"bytes,5,opt,name=fileLink,proto3" json:"fileLink,omitempty"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,6,rep,name=dataFiles,proto3" json:"dataFiles,omitempty"` | ||||
| 	PdfFile         string       `protobuf:"bytes,7,opt,name=pdfFile,proto3" json:"pdfFile,omitempty"` | ||||
| 	WordFile        string       `protobuf:"bytes,8,opt,name=wordFile,proto3" json:"wordFile,omitempty"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,9,opt,name=excelFile,proto3" json:"excelFile,omitempty"` | ||||
| 	Operator        string       `protobuf:"bytes,10,opt,name=operator,proto3" json:"operator,omitempty"` | ||||
| 	OperatorId      int32        `protobuf:"varint,11,opt,name=operatorId,proto3" json:"operatorId,omitempty"` | ||||
| 	FilingDate      string       `protobuf:"bytes,1,opt,name=filingDate,proto3" json:"filingDate"` | ||||
| 	Form            string       `protobuf:"bytes,2,opt,name=form,proto3" json:"form"` | ||||
| 	Description     string       `protobuf:"bytes,3,opt,name=description,proto3" json:"description"` | ||||
| 	FormDescription string       `protobuf:"bytes,4,opt,name=formDescription,proto3" json:"formDescription"` | ||||
| 	FileLink        string       `protobuf:"bytes,5,opt,name=fileLink,proto3" json:"fileLink"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,6,rep,name=dataFiles,proto3" json:"dataFiles"` | ||||
| 	PdfFile         string       `protobuf:"bytes,7,opt,name=pdfFile,proto3" json:"pdfFile"` | ||||
| 	WordFile        string       `protobuf:"bytes,8,opt,name=wordFile,proto3" json:"wordFile"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,9,opt,name=excelFile,proto3" json:"excelFile"` | ||||
| 	Operator        string       `protobuf:"bytes,10,opt,name=operator,proto3" json:"operator"` | ||||
| 	OperatorId      int32        `protobuf:"varint,11,opt,name=operatorId,proto3" json:"operatorId"` | ||||
| } | ||||
| 
 | ||||
| func (x *CreateSecFilingReq) Reset() { | ||||
| @ -527,18 +527,18 @@ type UpdateSecFilingReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingKey       string       `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey,omitempty"` | ||||
| 	Form            string       `protobuf:"bytes,2,opt,name=form,proto3" json:"form,omitempty"` | ||||
| 	Description     string       `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` | ||||
| 	FormDescription string       `protobuf:"bytes,4,opt,name=formDescription,proto3" json:"formDescription,omitempty"` | ||||
| 	FileLink        string       `protobuf:"bytes,5,opt,name=fileLink,proto3" json:"fileLink,omitempty"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,6,rep,name=dataFiles,proto3" json:"dataFiles,omitempty"` | ||||
| 	PdfFile         string       `protobuf:"bytes,7,opt,name=pdfFile,proto3" json:"pdfFile,omitempty"` | ||||
| 	WordFile        string       `protobuf:"bytes,8,opt,name=wordFile,proto3" json:"wordFile,omitempty"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,9,opt,name=excelFile,proto3" json:"excelFile,omitempty"` | ||||
| 	Operator        string       `protobuf:"bytes,10,opt,name=operator,proto3" json:"operator,omitempty"` | ||||
| 	OperatorId      int32        `protobuf:"varint,11,opt,name=operatorId,proto3" json:"operatorId,omitempty"` | ||||
| 	FilingDate      string       `protobuf:"bytes,12,opt,name=filingDate,proto3" json:"filingDate,omitempty"` | ||||
| 	FilingKey       string       `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey"` | ||||
| 	Form            string       `protobuf:"bytes,2,opt,name=form,proto3" json:"form"` | ||||
| 	Description     string       `protobuf:"bytes,3,opt,name=description,proto3" json:"description"` | ||||
| 	FormDescription string       `protobuf:"bytes,4,opt,name=formDescription,proto3" json:"formDescription"` | ||||
| 	FileLink        string       `protobuf:"bytes,5,opt,name=fileLink,proto3" json:"fileLink"` | ||||
| 	DataFiles       []*DataFiles `protobuf:"bytes,6,rep,name=dataFiles,proto3" json:"dataFiles"` | ||||
| 	PdfFile         string       `protobuf:"bytes,7,opt,name=pdfFile,proto3" json:"pdfFile"` | ||||
| 	WordFile        string       `protobuf:"bytes,8,opt,name=wordFile,proto3" json:"wordFile"` | ||||
| 	ExcelFile       string       `protobuf:"bytes,9,opt,name=excelFile,proto3" json:"excelFile"` | ||||
| 	Operator        string       `protobuf:"bytes,10,opt,name=operator,proto3" json:"operator"` | ||||
| 	OperatorId      int32        `protobuf:"varint,11,opt,name=operatorId,proto3" json:"operatorId"` | ||||
| 	FilingDate      string       `protobuf:"bytes,12,opt,name=filingDate,proto3" json:"filingDate"` | ||||
| } | ||||
| 
 | ||||
| func (x *UpdateSecFilingReq) Reset() { | ||||
| @ -660,7 +660,7 @@ type DetailSecFilingReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingKey string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey,omitempty"` | ||||
| 	FilingKey string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey"` | ||||
| } | ||||
| 
 | ||||
| func (x *DetailSecFilingReq) Reset() { | ||||
| @ -705,8 +705,8 @@ type SecFilingDetailResp struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Msg  string     `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` | ||||
| 	Data *SecFiling `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` | ||||
| 	Msg  string     `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg"` | ||||
| 	Data *SecFiling `protobuf:"bytes,2,opt,name=data,proto3" json:"data"` | ||||
| } | ||||
| 
 | ||||
| func (x *SecFilingDetailResp) Reset() { | ||||
| @ -758,12 +758,12 @@ type ListSecFilingReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Page            uint32 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` | ||||
| 	PageSize        uint32 `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"` | ||||
| 	Form            string `protobuf:"bytes,3,opt,name=form,proto3" json:"form,omitempty"` | ||||
| 	FilingDateBegin string `protobuf:"bytes,4,opt,name=filingDateBegin,proto3" json:"filingDateBegin,omitempty"` | ||||
| 	FilingDateEnd   string `protobuf:"bytes,5,opt,name=filingDateEnd,proto3" json:"filingDateEnd,omitempty"` | ||||
| 	Status          int32  `protobuf:"varint,6,opt,name=status,proto3" json:"status,omitempty"` | ||||
| 	Page            uint32 `protobuf:"varint,1,opt,name=page,proto3" json:"page"` | ||||
| 	PageSize        uint32 `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize"` | ||||
| 	Form            string `protobuf:"bytes,3,opt,name=form,proto3" json:"form"` | ||||
| 	FilingDateBegin string `protobuf:"bytes,4,opt,name=filingDateBegin,proto3" json:"filingDateBegin"` | ||||
| 	FilingDateEnd   string `protobuf:"bytes,5,opt,name=filingDateEnd,proto3" json:"filingDateEnd"` | ||||
| 	Status          int32  `protobuf:"varint,6,opt,name=status,proto3" json:"status"` | ||||
| } | ||||
| 
 | ||||
| func (x *ListSecFilingReq) Reset() { | ||||
| @ -843,9 +843,9 @@ type SecFilingListResp struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	Msg   string       `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` | ||||
| 	Total uint32       `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"` | ||||
| 	Data  []*SecFiling `protobuf:"bytes,3,rep,name=data,proto3" json:"data,omitempty"` | ||||
| 	Msg   string       `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg"` | ||||
| 	Total uint32       `protobuf:"varint,2,opt,name=total,proto3" json:"total"` | ||||
| 	Data  []*SecFiling `protobuf:"bytes,3,rep,name=data,proto3" json:"data"` | ||||
| } | ||||
| 
 | ||||
| func (x *SecFilingListResp) Reset() { | ||||
| @ -904,9 +904,9 @@ type DeleteSecFilingReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingKey  string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey,omitempty"` | ||||
| 	Operator   string `protobuf:"bytes,2,opt,name=operator,proto3" json:"operator,omitempty"` | ||||
| 	OperatorId int32  `protobuf:"varint,3,opt,name=operatorId,proto3" json:"operatorId,omitempty"` | ||||
| 	FilingKey  string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey"` | ||||
| 	Operator   string `protobuf:"bytes,2,opt,name=operator,proto3" json:"operator"` | ||||
| 	OperatorId int32  `protobuf:"varint,3,opt,name=operatorId,proto3" json:"operatorId"` | ||||
| } | ||||
| 
 | ||||
| func (x *DeleteSecFilingReq) Reset() { | ||||
| @ -965,10 +965,10 @@ type UpdateSecFilingStatusReq struct { | ||||
| 	sizeCache     protoimpl.SizeCache | ||||
| 	unknownFields protoimpl.UnknownFields | ||||
| 
 | ||||
| 	FilingKey  string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey,omitempty"` | ||||
| 	Status     int32  `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"` | ||||
| 	Operator   string `protobuf:"bytes,3,opt,name=operator,proto3" json:"operator,omitempty"` | ||||
| 	OperatorId int32  `protobuf:"varint,4,opt,name=operatorId,proto3" json:"operatorId,omitempty"` | ||||
| 	FilingKey  string `protobuf:"bytes,1,opt,name=filingKey,proto3" json:"filingKey"` | ||||
| 	Status     int32  `protobuf:"varint,2,opt,name=status,proto3" json:"status"` | ||||
| 	Operator   string `protobuf:"bytes,3,opt,name=operator,proto3" json:"operator"` | ||||
| 	OperatorId int32  `protobuf:"varint,4,opt,name=operatorId,proto3" json:"operatorId"` | ||||
| } | ||||
| 
 | ||||
| func (x *UpdateSecFilingStatusReq) Reset() { | ||||
|  | ||||
| @ -24,6 +24,7 @@ func BundleOrderRouter(r *gin.RouterGroup) { | ||||
| 		{ | ||||
| 			bundleOrderClientWebRoute.POST("bundle-order-list", bundle.OrderRecordsList) | ||||
| 			bundleOrderClientWebRoute.POST("bundle-order-list-V2", bundle.OrderRecordsListV2) | ||||
| 			bundleOrderClientWebRoute.POST("reconciliation-list", bundle.GetReconciliationList) | ||||
| 		} | ||||
| 		bundleOrderClientAppRoute := bundleOrderRoute.Group("common/app") | ||||
| 		{ | ||||
|  | ||||
| @ -250,7 +250,18 @@ func CreateAntomPay(c *gin.Context) { | ||||
| 		service.Error(c, updateOrderRecordErr) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	////创建对账单 todo 待修改
 | ||||
| 	//_, err = service.BundleProvider.CreateReconciliation(context.Background(), &bundle.ReconciliationInfo{
 | ||||
| 	//	BundleOrderOn:    detail.OrderRecord.OrderNo,
 | ||||
| 	//	BundleAddOrderOn: detail.OrderRecord.OrderNo,
 | ||||
| 	//	UserName:         userInfo.Name,
 | ||||
| 	//	UserTel:          userInfo.TelNum,
 | ||||
| 	//	BundleName:       detail.OrderRecord.BundleName,
 | ||||
| 	//	Amount:           detail.OrderRecord.TotalAmount,
 | ||||
| 	//	CurrencyType:     int32(detail.OrderRecord.AmountType),
 | ||||
| 	//	PayStatus:        1,
 | ||||
| 	//	UserId:           userInfo.ID,
 | ||||
| 	//})
 | ||||
| 	service.Success(c, resp) | ||||
| 
 | ||||
| } | ||||
|  | ||||
							
								
								
									
										25
									
								
								pkg/service/bundle/reconciliation.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								pkg/service/bundle/reconciliation.go
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,25 @@ | ||||
| package bundle | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fonchain-fiee/api/bundle" | ||||
| 	"fonchain-fiee/pkg/service" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/gin-gonic/gin/binding" | ||||
| ) | ||||
| 
 | ||||
| func GetReconciliationList(c *gin.Context) { | ||||
| 	var req bundle.GetReconciliationListReq | ||||
| 	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil { | ||||
| 		service.Error(c, err) | ||||
| 		return | ||||
| 	} | ||||
| 	detail, detailErr := service.BundleProvider.GetReconciliationList(context.Background(), &req) | ||||
| 	if detailErr != nil { | ||||
| 		service.Error(c, detailErr) | ||||
| 		return | ||||
| 	} | ||||
| 	service.Success(c, detail) | ||||
| 	return | ||||
| 
 | ||||
| } | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user