wfz 3 years ago
parent
commit
7e2dfcf728

File diff suppressed because it is too large
+ 610 - 411
api/partner/partner.pb.go


+ 30 - 0
api/partner/partner.proto

@@ -277,7 +277,33 @@ service Partner {
       body:"*"
     };
   };
+  // 接待员申请提现
+  rpc PartnerApplyWithdraw (PartnerApplyWithdrawRequest) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/partner/withdraw",
+      body:"*"
+    };
+  };
+  // 接待员提现模板列表
+  rpc PartnerWithdrawTemplateList (google.protobuf.Empty) returns (PartnerWithdrawTemplateListReply){
+    option (google.api.http) = {
+      post: "/api/partner/withdraw/template/list",
+      body:"*"
+    };
+  };
 }
+
+message PartnerWithdrawTemplateListReply{
+  repeated PartnerWithdrawTemplateInfo list = 1;
+}
+
+message PartnerWithdrawTemplateInfo {
+  int64 id = 1;
+  int64 money = 2;// 提现多少钱
+  int64 credit = 3;// 提现需要多少积分
+  string title = 4;// 提现的标题
+}
+
 message PartnerUpdateWorkingStatusRequest{
   string workingStatus = 1;// 工作状态
 }
@@ -354,4 +380,8 @@ message RandomPartnerInfo{
 
 message GetRandomPartnerRequest{
   int64 sex = 1;// 性别
+}
+
+message PartnerApplyWithdrawRequest{
+  int64 templateId = 1;// 提现模板id
 }

+ 76 - 0
api/partner/partner_grpc.pb.go

@@ -110,6 +110,10 @@ type PartnerClient interface {
 	FindOverSevenDayAvatar(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.FindOverSevenDayAvatarReply, error)
 	// 查询未处理的数据
 	FindNotReplyNum(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*chat.FindNotReplyNumReply, error)
+	// 接待员申请提现
+	PartnerApplyWithdraw(ctx context.Context, in *PartnerApplyWithdrawRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 接待员提现模板列表
+	PartnerWithdrawTemplateList(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerWithdrawTemplateListReply, error)
 }
 
 type partnerClient struct {
@@ -498,6 +502,24 @@ func (c *partnerClient) FindNotReplyNum(ctx context.Context, in *emptypb.Empty,
 	return out, nil
 }
 
+func (c *partnerClient) PartnerApplyWithdraw(ctx context.Context, in *PartnerApplyWithdrawRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PartnerApplyWithdraw", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *partnerClient) PartnerWithdrawTemplateList(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerWithdrawTemplateListReply, error) {
+	out := new(PartnerWithdrawTemplateListReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PartnerWithdrawTemplateList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // PartnerServer is the server API for Partner service.
 // All implementations must embed UnimplementedPartnerServer
 // for forward compatibility
@@ -590,6 +612,10 @@ type PartnerServer interface {
 	FindOverSevenDayAvatar(context.Context, *emptypb.Empty) (*common.FindOverSevenDayAvatarReply, error)
 	// 查询未处理的数据
 	FindNotReplyNum(context.Context, *emptypb.Empty) (*chat.FindNotReplyNumReply, error)
+	// 接待员申请提现
+	PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error)
+	// 接待员提现模板列表
+	PartnerWithdrawTemplateList(context.Context, *emptypb.Empty) (*PartnerWithdrawTemplateListReply, error)
 	mustEmbedUnimplementedPartnerServer()
 }
 
@@ -723,6 +749,12 @@ func (UnimplementedPartnerServer) FindOverSevenDayAvatar(context.Context, *empty
 func (UnimplementedPartnerServer) FindNotReplyNum(context.Context, *emptypb.Empty) (*chat.FindNotReplyNumReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindNotReplyNum not implemented")
 }
+func (UnimplementedPartnerServer) PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PartnerApplyWithdraw not implemented")
+}
+func (UnimplementedPartnerServer) PartnerWithdrawTemplateList(context.Context, *emptypb.Empty) (*PartnerWithdrawTemplateListReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PartnerWithdrawTemplateList not implemented")
+}
 func (UnimplementedPartnerServer) mustEmbedUnimplementedPartnerServer() {}
 
 // UnsafePartnerServer may be embedded to opt out of forward compatibility for this service.
@@ -1492,6 +1524,42 @@ func _Partner_FindNotReplyNum_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_PartnerApplyWithdraw_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PartnerApplyWithdrawRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PartnerApplyWithdraw(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PartnerApplyWithdraw",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PartnerApplyWithdraw(ctx, req.(*PartnerApplyWithdrawRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Partner_PartnerWithdrawTemplateList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(emptypb.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PartnerWithdrawTemplateList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PartnerWithdrawTemplateList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PartnerWithdrawTemplateList(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Partner_ServiceDesc is the grpc.ServiceDesc for Partner service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1667,6 +1735,14 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindNotReplyNum",
 			Handler:    _Partner_FindNotReplyNum_Handler,
 		},
+		{
+			MethodName: "PartnerApplyWithdraw",
+			Handler:    _Partner_PartnerApplyWithdraw_Handler,
+		},
+		{
+			MethodName: "PartnerWithdrawTemplateList",
+			Handler:    _Partner_PartnerWithdrawTemplateList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "partner.proto",

+ 86 - 0
api/partner/partner_http.pb.go

@@ -52,6 +52,7 @@ type PartnerHTTPServer interface {
 	GetPartnerIsLike(context.Context, *common.PersonParam) (*common.IsLike, error)
 	GetPartnerLookNum(context.Context, *emptypb.Empty) (*statistics.LookMessageReply, error)
 	GetPartnerMessage(context.Context, *emptypb.Empty) (*PartnerMessage, error)
+	PartnerApplyWithdraw(context.Context, *PartnerApplyWithdrawRequest) (*emptypb.Empty, error)
 	PartnerGetAward(context.Context, *PartnerGetAwardRequest) (*emptypb.Empty, error)
 	PartnerGetChatCard(context.Context, *common.PersonParam) (*common.PartnerChatCardInfo, error)
 	PartnerGetHomeInfo(context.Context, *common.PersonParam) (*common.HomeInfo, error)
@@ -59,6 +60,7 @@ type PartnerHTTPServer interface {
 	PartnerLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	PartnerUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	PartnerUpdateWorkingStatus(context.Context, *PartnerUpdateWorkingStatusRequest) (*emptypb.Empty, error)
+	PartnerWithdrawTemplateList(context.Context, *emptypb.Empty) (*PartnerWithdrawTemplateListReply, error)
 	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
 	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	Report(context.Context, *common.ReportChatRequest) (*emptypb.Empty, error)
@@ -104,6 +106,8 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/working/status/update", _Partner_PartnerUpdateWorkingStatus0_HTTP_Handler(srv))
 	r.POST("/api/partner/over/avatar/list", _Partner_FindOverSevenDayAvatar0_HTTP_Handler(srv))
 	r.POST("/api/partner/chat/unreply/num", _Partner_FindNotReplyNum0_HTTP_Handler(srv))
+	r.POST("/api/partner/withdraw", _Partner_PartnerApplyWithdraw0_HTTP_Handler(srv))
+	r.POST("/api/partner/withdraw/template/list", _Partner_PartnerWithdrawTemplateList0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -1051,6 +1055,60 @@ func _Partner_FindNotReplyNum0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http
 	}
 }
 
+func _Partner_PartnerApplyWithdraw0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in PartnerApplyWithdrawRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PartnerApplyWithdraw")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PartnerApplyWithdraw(ctx, req.(*PartnerApplyWithdrawRequest))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
+func _Partner_PartnerWithdrawTemplateList0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in emptypb.Empty
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PartnerWithdrawTemplateList")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PartnerWithdrawTemplateList(ctx, req.(*emptypb.Empty))
+		})
+		out, err := h(ctx, &in)
+		if err != nil {
+			return err
+		}
+		success := &reply.SuccessReply{
+			Code: 0,
+		}
+		if out != nil {
+			success.Data = out
+		}
+		return ctx.Result(200, success)
+	}
+}
+
 type PartnerHTTPClient interface {
 	CheckPhoneCode(ctx context.Context, req *common.CheckPhoneCodeRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	CreateUserPartnerRoom(ctx context.Context, req *common.CreateChatRoomParam, opts ...http.CallOption) (rsp *chat.RoomReply, err error)
@@ -1074,6 +1132,7 @@ type PartnerHTTPClient interface {
 	GetPartnerIsLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.IsLike, err error)
 	GetPartnerLookNum(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *statistics.LookMessageReply, err error)
 	GetPartnerMessage(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerMessage, err error)
+	PartnerApplyWithdraw(ctx context.Context, req *PartnerApplyWithdrawRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerGetAward(ctx context.Context, req *PartnerGetAwardRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerGetChatCard(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.PartnerChatCardInfo, err error)
 	PartnerGetHomeInfo(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
@@ -1081,6 +1140,7 @@ type PartnerHTTPClient interface {
 	PartnerLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerUnLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	PartnerUpdateWorkingStatus(ctx context.Context, req *PartnerUpdateWorkingStatusRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	PartnerWithdrawTemplateList(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerWithdrawTemplateListReply, err error)
 	RandomMeme(ctx context.Context, req *common.RandomNum, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
 	RandomSwiftMessage(ctx context.Context, req *common.RandomNumAndSex, opts ...http.CallOption) (rsp *common.CommonTextList, err error)
 	Report(ctx context.Context, req *common.ReportChatRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
@@ -1383,6 +1443,19 @@ func (c *PartnerHTTPClientImpl) GetPartnerMessage(ctx context.Context, in *empty
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) PartnerApplyWithdraw(ctx context.Context, in *PartnerApplyWithdrawRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/partner/withdraw"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PartnerApplyWithdraw"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) PartnerGetAward(ctx context.Context, in *PartnerGetAwardRequest, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/partner/chat/award"
@@ -1474,6 +1547,19 @@ func (c *PartnerHTTPClientImpl) PartnerUpdateWorkingStatus(ctx context.Context,
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) PartnerWithdrawTemplateList(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*PartnerWithdrawTemplateListReply, error) {
+	var out PartnerWithdrawTemplateListReply
+	pattern := "/api/partner/withdraw/template/list"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PartnerWithdrawTemplateList"))
+	opts = append(opts, http.PathTemplate(pattern))
+	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &out, err
+}
+
 func (c *PartnerHTTPClientImpl) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...http.CallOption) (*common.CommonTextList, error) {
 	var out common.CommonTextList
 	pattern := "/api/partner/find/meme/random"

+ 6 - 0
define/partner.go

@@ -4,3 +4,9 @@ var (
 	WorkingStatusOnline  = "online"  // 在线
 	WorkingStatusOffline = "offline" // 离线
 )
+
+var (
+	WithdrawStatusWait    = "wait"
+	WithdrawStatusFail    = "fail"
+	WithdrawStatusSuccess = "success"
+)

+ 1 - 0
errors/partner.go

@@ -4,4 +4,5 @@ import "git.ikuban.com/server/kratos-utils/codes"
 
 var (
 	ErrorPartnerNotExist = codes.Error(20001, "陪伴者不存在")
+	ErrorWithdrawNotFind = codes.Error(20001, "提现套餐不存在")
 )

+ 11 - 1
js/api/partner/partner_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {PartnerInfo,PartnerBalance,PartnerDBBalance,PartnerMessage,GetRandomPartnerRequest,RandomPartnerInfo,AddPartnerBalanceRequest,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest} from "./partner_pb";
+import {PartnerInfo,PartnerBalance,PartnerDBBalance,PartnerMessage,GetRandomPartnerRequest,RandomPartnerInfo,AddPartnerBalanceRequest,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply} from "./partner_pb";
 import {PartnerIDParam,PersonIDParam,PersonMsg,SendPhoneCodeRequest,CheckPhoneCodeRequest,AddFriendMessageInfo,UpdateInformationRequest,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,PersonIDList,PersonDBReply,WxConfReq,WxConfResponse,CreateChatRoomParam,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,FindRecommendRequest,FindOverSevenDayAvatarReply} from "../common/common_pb";
 import {LookMessageReply,LookAndLikeListReply} from "../statistics/statistics_pb";
 import {RoomReply,PartnerFindRoomListReply,FindNotReplyNumReply} from "../chat/chat_pb";
@@ -188,6 +188,16 @@ const PartnerService = {
 	const res = await request.post<{ data: FindNotReplyNumReply, code: string, message: string }>('/api/partner/chat/unreply/num', req);
     return res.data.data;
   },
+  /**  接待员申请提现 */
+  PartnerApplyWithdraw: async (req?: PartnerApplyWithdrawRequest) => {
+	const res = await request.post('/api/partner/withdraw', req);
+    return res.data.data;
+  },
+  /**  接待员提现模板列表 */
+  PartnerWithdrawTemplateList: async (req?: undefined) => {
+	const res = await request.post<{ data: PartnerWithdrawTemplateListReply, code: string, message: string }>('/api/partner/withdraw/template/list', req);
+    return res.data.data;
+  },
 
 };
 

+ 16 - 0
js/api/partner/partner_pb.ts

@@ -1,3 +1,15 @@
+export interface PartnerWithdrawTemplateListReply{
+    list?:Array<PartnerWithdrawTemplateInfo>;
+}
+export interface PartnerWithdrawTemplateInfo{
+    id?:number;
+    /**  提现多少钱 */
+    money?:number;
+    /**  提现需要多少积分 */
+    credit?:number;
+    /**  提现的标题 */
+    title?:string;
+}
 export interface PartnerUpdateWorkingStatusRequest{
     /**  工作状态 */
     workingStatus?:string;
@@ -107,4 +119,8 @@ export interface GetRandomPartnerRequest{
     /**  性别 */
     sex?:number;
 }
+export interface PartnerApplyWithdrawRequest{
+    /**  提现模板id */
+    templateId?:number;
+}
 

Some files were not shown because too many files changed in this diff