diff --git a/customer/customer.go b/customer/customer.go index 2ce164f..aef31de 100644 --- a/customer/customer.go +++ b/customer/customer.go @@ -1,5 +1,8 @@ package customer +import "git.oa00.com/supply-chain/service/customer/service" + type Customer struct { - User user + User user + Service service.Service } diff --git a/customer/service/audit.go b/customer/service/audit.go index bb7bd49..553b5b1 100644 --- a/customer/service/audit.go +++ b/customer/service/audit.go @@ -3,10 +3,12 @@ package service import ( "context" "git.oa00.com/supply-chain/service/client" + audit2 "git.oa00.com/supply-chain/service/customer/service/audit" "git.oa00.com/supply-chain/service/lib/bean" ) type audit struct { + audit2.Audit } type AuditSearch struct { Status uint // 审核状态 1=未审核 2=通过 3=驳回 diff --git a/customer/service/audit/audit.go b/customer/service/audit/audit.go new file mode 100644 index 0000000..ccbd49d --- /dev/null +++ b/customer/service/audit/audit.go @@ -0,0 +1,5 @@ +package audit + +type Audit struct { + Supply supply +} diff --git a/customer/service/audit/supply.go b/customer/service/audit/supply.go index 821f006..368109e 100644 --- a/customer/service/audit/supply.go +++ b/customer/service/audit/supply.go @@ -9,7 +9,7 @@ type supply struct { } type ArgsSupplyApply struct { - ApplyId uint // 申请人id + ApplyUserId uint // 申请人id CustomerId uint // 客户id RateId uint // 费率id ExpirationAt int64 // 到期时间 @@ -27,7 +27,7 @@ func (s *supply) Apply(ctx context.Context, args ArgsSupplyApply) error { } type ArgsSupplyAdopt struct { - AuditId uint // 审核人id + AuditUserId uint // 审核人id UserServiceId uint // 客户服务id } @@ -42,7 +42,7 @@ func (s *supply) Adopt(ctx context.Context, args ArgsSupplyAdopt) error { } type ArgsSupplyReject struct { - AuditId uint // 审核人id + AuditUserId uint // 审核人id UserServiceId uint // 客户服务id Reason string // 驳回原因 } diff --git a/customer/service/service.go b/customer/service/service.go new file mode 100644 index 0000000..6a8ec8c --- /dev/null +++ b/customer/service/service.go @@ -0,0 +1,5 @@ +package service + +type Service struct { + Audit audit +}