From e18b1713e76ea31cfdbb73715bd9800e0de1b836 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 11 Aug 2022 10:57:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/service.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/customer/service/service.go b/customer/service/service.go index c93011f..13a8458 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -13,6 +13,9 @@ type ReplyServiceAll struct { ServiceId uint `json:"serviceId"` ServiceName string `json:"serviceName"` EndTime int64 `json:"endTime"` + AppKey string `json:"appKey"` + AppSecret string `json:"appSecret"` + AuditStatus uint `json:"auditStatus"` } // All @Title 全部服务 From 3f7f6d9e9ccce7a5d3043b861ce1c5198c946e93 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 11 Aug 2022 11:13:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/service.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/customer/service/service.go b/customer/service/service.go index 13a8458..18b569d 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -9,7 +9,12 @@ type Service struct { Audit audit } -type ReplyServiceAll struct { +type ArgsServiceLists struct { + CustomerId uint + Status uint +} + +type ReplyServiceLists struct { ServiceId uint `json:"serviceId"` ServiceName string `json:"serviceName"` EndTime int64 `json:"endTime"` @@ -18,12 +23,12 @@ type ReplyServiceAll struct { AuditStatus uint `json:"auditStatus"` } -// All @Title 全部服务 -func (s *Service) All(ctx context.Context, customerId uint) (reply []ReplyServiceAll, err error) { +// Lists @Title 全部服务 +func (s *Service) Lists(ctx context.Context, args ArgsAuditLists) (reply []ReplyServiceLists, err error) { xClient, err := client.GetClient(s) if err != nil { return } - err = xClient.Call(ctx, "All", customerId, &reply) + err = xClient.Call(ctx, "Lists", args, &reply) return } From fbcac03aee421a47562bea4936f4fcd876bea4c7 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 11 Aug 2022 11:16:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customer/service/service.go b/customer/service/service.go index 18b569d..e771599 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -24,7 +24,7 @@ type ReplyServiceLists struct { } // Lists @Title 全部服务 -func (s *Service) Lists(ctx context.Context, args ArgsAuditLists) (reply []ReplyServiceLists, err error) { +func (s *Service) Lists(ctx context.Context, args ArgsServiceLists) (reply []ReplyServiceLists, err error) { xClient, err := client.GetClient(s) if err != nil { return From aa1f4b912cd6a5410c5de357fcbbbdf91beefc41 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 11 Aug 2022 11:38:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- customer/service/service.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/customer/service/service.go b/customer/service/service.go index e771599..b72a1ab 100644 --- a/customer/service/service.go +++ b/customer/service/service.go @@ -18,17 +18,15 @@ type ReplyServiceLists struct { ServiceId uint `json:"serviceId"` ServiceName string `json:"serviceName"` EndTime int64 `json:"endTime"` - AppKey string `json:"appKey"` - AppSecret string `json:"appSecret"` AuditStatus uint `json:"auditStatus"` } -// Lists @Title 全部服务 -func (s *Service) Lists(ctx context.Context, args ArgsServiceLists) (reply []ReplyServiceLists, err error) { +// All @Title 全部服务 +func (s *Service) All(ctx context.Context, customerId uint) (reply []ReplyServiceLists, err error) { xClient, err := client.GetClient(s) if err != nil { return } - err = xClient.Call(ctx, "Lists", args, &reply) + err = xClient.Call(ctx, "All", customerId, &reply) return }