Merge branch 'master' of git.oa00.com:supply-chain/service

customer/service.go

@@ -1,5 +1,7 @@
 package customer
 
+import "git.oa00.com/supply-chain/service/customer/service"
+
 type serviceId uint
 
 const (
@@ -10,3 +12,7 @@ const (
 	UserServiceStatusAdopt  = 2 // 审核通过
 	UserServiceStatusReject = 3 // 审核驳回
 )
+
+type Service struct {
+	Audit service.Audit
+}

customer/service/audit.go

@@ -3,11 +3,14 @@ package service
 import (
 	"context"
 	"git.oa00.com/supply-chain/service/client"
+	"git.oa00.com/supply-chain/service/customer/service/audit"
 	"git.oa00.com/supply-chain/service/lib/bean"
 )
 
-type audit struct {
+type Audit struct {
+	Supply audit.Supply
 }
+
 type AuditSearch struct {
 	Status uint   // 审核状态 1=未审核 2=通过 3=驳回
 	Name   string // 用户名称
@@ -33,7 +36,7 @@ type ReplyAuditLists struct {
 }
 
 // Lists @Title 服务审核列表
-func (a *audit) Lists(ctx context.Context, args ArgsAuditLists) (reply ReplyAuditLists, err error) {
+func (a *Audit) Lists(ctx context.Context, args ArgsAuditLists) (reply ReplyAuditLists, err error) {
 	xClient, err := client.GetClient(a)
 	if err != nil {
 		return

customer/service/audit/supply.go

@@ -5,7 +5,7 @@ import (
 	"git.oa00.com/supply-chain/service/client"
 )
 
-type supply struct {
+type Supply struct {
 }
 
 type ArgsSupplyApply struct {
@@ -17,7 +17,7 @@ type ArgsSupplyApply struct {
 }
 
 // Apply @Title 申请
-func (s *supply) Apply(ctx context.Context, args ArgsSupplyApply) error {
+func (s *Supply) Apply(ctx context.Context, args ArgsSupplyApply) error {
 	reply := 0
 	xClient, err := client.GetClient(s)
 	if err != nil {
@@ -32,7 +32,7 @@ type ArgsSupplyAdopt struct {
 }
 
 // Adopt @Title 审核通过
-func (s *supply) Adopt(ctx context.Context, args ArgsSupplyAdopt) error {
+func (s *Supply) Adopt(ctx context.Context, args ArgsSupplyAdopt) error {
 	reply := 0
 	xClient, err := client.GetClient(s)
 	if err != nil {
@@ -48,7 +48,7 @@ type ArgsSupplyReject struct {
 }
 
 // Reject @Title 驳回
-func (s *supply) Reject(ctx context.Context, args ArgsSupplyReject) error {
+func (s *Supply) Reject(ctx context.Context, args ArgsSupplyReject) error {
 	reply := 0
 	xClient, err := client.GetClient(s)
 	if err != nil {
@@ -74,7 +74,7 @@ type ReplySupplyInfo struct {
 }
 
 // Info @Title 详情
-func (s *supply) Info(ctx context.Context, userServiceId uint) (reply ReplySupplyInfo, err error) {
+func (s *Supply) Info(ctx context.Context, userServiceId uint) (reply ReplySupplyInfo, err error) {
 	xClient, err := client.GetClient(s)
 	if err != nil {
 		return