Prechádzať zdrojové kódy

接待员房间收益以及今日收益

wfz 3 rokov pred
rodič
commit
c28734c1a9

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 525 - 470
api/chat/chat.pb.go


+ 6 - 0
api/chat/chat.proto

@@ -73,6 +73,12 @@ service Chat {
   rpc UserUnlockVoice (UserUnlockRequest) returns (google.protobuf.Empty){};
   // 用户解锁图片
   rpc UserUnlockPicture (UserUnlockRequest) returns (google.protobuf.Empty){};
+  // 获取房间的接待员收益
+  rpc GetRoomProfit (common.RoomIDRequest) returns (GetRoomProfitReply){};
+}
+
+message GetRoomProfitReply{
+  int64 roomProfit = 1;// 房间收益
 }
 
 message UserUnlockRequest{

+ 38 - 0
api/chat/chat_grpc.pb.go

@@ -81,6 +81,8 @@ type ChatClient interface {
 	UserUnlockVoice(ctx context.Context, in *UserUnlockRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 用户解锁图片
 	UserUnlockPicture(ctx context.Context, in *UserUnlockRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 获取房间的接待员收益
+	GetRoomProfit(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*GetRoomProfitReply, error)
 }
 
 type chatClient struct {
@@ -370,6 +372,15 @@ func (c *chatClient) UserUnlockPicture(ctx context.Context, in *UserUnlockReques
 	return out, nil
 }
 
+func (c *chatClient) GetRoomProfit(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*GetRoomProfitReply, error) {
+	out := new(GetRoomProfitReply)
+	err := c.cc.Invoke(ctx, "/api.chat.Chat/GetRoomProfit", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // ChatServer is the server API for Chat service.
 // All implementations must embed UnimplementedChatServer
 // for forward compatibility
@@ -435,6 +446,8 @@ type ChatServer interface {
 	UserUnlockVoice(context.Context, *UserUnlockRequest) (*emptypb.Empty, error)
 	// 用户解锁图片
 	UserUnlockPicture(context.Context, *UserUnlockRequest) (*emptypb.Empty, error)
+	// 获取房间的接待员收益
+	GetRoomProfit(context.Context, *common.RoomIDRequest) (*GetRoomProfitReply, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -535,6 +548,9 @@ func (UnimplementedChatServer) UserUnlockVoice(context.Context, *UserUnlockReque
 func (UnimplementedChatServer) UserUnlockPicture(context.Context, *UserUnlockRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserUnlockPicture not implemented")
 }
+func (UnimplementedChatServer) GetRoomProfit(context.Context, *common.RoomIDRequest) (*GetRoomProfitReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetRoomProfit not implemented")
+}
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
 
 // UnsafeChatServer may be embedded to opt out of forward compatibility for this service.
@@ -1106,6 +1122,24 @@ func _Chat_UserUnlockPicture_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Chat_GetRoomProfit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RoomIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ChatServer).GetRoomProfit(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.chat.Chat/GetRoomProfit",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ChatServer).GetRoomProfit(ctx, req.(*common.RoomIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Chat_ServiceDesc is the grpc.ServiceDesc for Chat service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1237,6 +1271,10 @@ var Chat_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UserUnlockPicture",
 			Handler:    _Chat_UserUnlockPicture_Handler,
 		},
+		{
+			MethodName: "GetRoomProfit",
+			Handler:    _Chat_GetRoomProfit_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "chat.proto",

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 684 - 612
api/partner/partner.pb.go


+ 12 - 0
api/partner/partner.proto

@@ -382,6 +382,13 @@ service Partner {
       body:"*"
     };
   };
+  // 接待员获取房间收益以及今日收益
+  rpc PartnerGetRoomBalanceAndTodayBalance (common.RoomIDRequest) returns (PartnerGetRoomBalanceAndTodayBalanceReply){
+    option (google.api.http) = {
+      post: "/api/partner/balance/room",
+      body:"*"
+    };
+  };
 
 
   // ---rpc---
@@ -404,6 +411,11 @@ service Partner {
   rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (common.AddFriendMessageInfo);
 }
 
+message PartnerGetRoomBalanceAndTodayBalanceReply{
+  int64 todayProfit = 1;// 今日收益
+  int64 roomProfit = 2;// 房间收益
+}
+
 message PartnerCollectIDsRequest{
   repeated int64 chatRecordIds = 1;// 记录ID
   int64 roomId = 2;// 房间ID

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

@@ -125,6 +125,8 @@ type PartnerClient interface {
 	PartnerWithdrawTemplateList(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerWithdrawTemplateListReply, error)
 	// 接待员提现记录列表
 	PartnerWithdrawRecordList(ctx context.Context, in *common.ListPageRequest, opts ...grpc.CallOption) (*PartnerWithdrawRecordListReply, error)
+	// 接待员获取房间收益以及今日收益
+	PartnerGetRoomBalanceAndTodayBalance(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*PartnerGetRoomBalanceAndTodayBalanceReply, error)
 	// ---rpc---
 	// 1、获取用户详情
 	GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error)
@@ -611,6 +613,15 @@ func (c *partnerClient) PartnerWithdrawRecordList(ctx context.Context, in *commo
 	return out, nil
 }
 
+func (c *partnerClient) PartnerGetRoomBalanceAndTodayBalance(ctx context.Context, in *common.RoomIDRequest, opts ...grpc.CallOption) (*PartnerGetRoomBalanceAndTodayBalanceReply, error) {
+	out := new(PartnerGetRoomBalanceAndTodayBalanceReply)
+	err := c.cc.Invoke(ctx, "/api.partner.Partner/PartnerGetRoomBalanceAndTodayBalance", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *partnerClient) GetPartnerDBMsg(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*common.PersonMsg, error) {
 	out := new(common.PersonMsg)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerDBMsg", in, out, opts...)
@@ -790,6 +801,8 @@ type PartnerServer interface {
 	PartnerWithdrawTemplateList(context.Context, *emptypb.Empty) (*PartnerWithdrawTemplateListReply, error)
 	// 接待员提现记录列表
 	PartnerWithdrawRecordList(context.Context, *common.ListPageRequest) (*PartnerWithdrawRecordListReply, error)
+	// 接待员获取房间收益以及今日收益
+	PartnerGetRoomBalanceAndTodayBalance(context.Context, *common.RoomIDRequest) (*PartnerGetRoomBalanceAndTodayBalanceReply, error)
 	// ---rpc---
 	// 1、获取用户详情
 	GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error)
@@ -967,6 +980,9 @@ func (UnimplementedPartnerServer) PartnerWithdrawTemplateList(context.Context, *
 func (UnimplementedPartnerServer) PartnerWithdrawRecordList(context.Context, *common.ListPageRequest) (*PartnerWithdrawRecordListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PartnerWithdrawRecordList not implemented")
 }
+func (UnimplementedPartnerServer) PartnerGetRoomBalanceAndTodayBalance(context.Context, *common.RoomIDRequest) (*PartnerGetRoomBalanceAndTodayBalanceReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method PartnerGetRoomBalanceAndTodayBalance not implemented")
+}
 func (UnimplementedPartnerServer) GetPartnerDBMsg(context.Context, *common.PersonIDParam) (*common.PersonMsg, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerDBMsg not implemented")
 }
@@ -1922,6 +1938,24 @@ func _Partner_PartnerWithdrawRecordList_Handler(srv interface{}, ctx context.Con
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Partner_PartnerGetRoomBalanceAndTodayBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(common.RoomIDRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(PartnerServer).PartnerGetRoomBalanceAndTodayBalance(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.partner.Partner/PartnerGetRoomBalanceAndTodayBalance",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(PartnerServer).PartnerGetRoomBalanceAndTodayBalance(ctx, req.(*common.RoomIDRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Partner_GetPartnerDBMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.PersonIDParam)
 	if err := dec(in); err != nil {
@@ -2277,6 +2311,10 @@ var Partner_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "PartnerWithdrawRecordList",
 			Handler:    _Partner_PartnerWithdrawRecordList_Handler,
 		},
+		{
+			MethodName: "PartnerGetRoomBalanceAndTodayBalance",
+			Handler:    _Partner_PartnerGetRoomBalanceAndTodayBalance_Handler,
+		},
 		{
 			MethodName: "GetPartnerDBMsg",
 			Handler:    _Partner_GetPartnerDBMsg_Handler,

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

@@ -66,6 +66,7 @@ type PartnerHTTPServer interface {
 	PartnerGetChatCard(context.Context, *common.PersonParam) (*common.PartnerChatCardInfo, error)
 	PartnerGetHomeInfo(context.Context, *common.PersonParam) (*common.HomeInfo, error)
 	PartnerGetPersonLikedAndLooked(context.Context, *common.PersonParam) (*common.LookedAndLikedNum, error)
+	PartnerGetRoomBalanceAndTodayBalance(context.Context, *common.RoomIDRequest) (*PartnerGetRoomBalanceAndTodayBalanceReply, error)
 	PartnerLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	PartnerUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	PartnerUpdateWorkingStatus(context.Context, *PartnerUpdateWorkingStatusRequest) (*emptypb.Empty, error)
@@ -136,6 +137,7 @@ func RegisterPartnerHTTPServer(s *http.Server, srv PartnerHTTPServer) {
 	r.POST("/api/partner/withdraw", _Partner_PartnerApplyWithdraw0_HTTP_Handler(srv))
 	r.POST("/api/partner/withdraw/template/list", _Partner_PartnerWithdrawTemplateList0_HTTP_Handler(srv))
 	r.POST("/api/partner/withdraw/record/list", _Partner_PartnerWithdrawRecordList0_HTTP_Handler(srv))
+	r.POST("/api/partner/balance/room", _Partner_PartnerGetRoomBalanceAndTodayBalance0_HTTP_Handler(srv))
 }
 
 func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
@@ -1515,6 +1517,33 @@ func _Partner_PartnerWithdrawRecordList0_HTTP_Handler(srv PartnerHTTPServer) fun
 	}
 }
 
+func _Partner_PartnerGetRoomBalanceAndTodayBalance0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in common.RoomIDRequest
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.partner.Partner/PartnerGetRoomBalanceAndTodayBalance")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.PartnerGetRoomBalanceAndTodayBalance(ctx, req.(*common.RoomIDRequest))
+		})
+		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)
 	CreateScrip(ctx context.Context, req *CreateScripRequest, opts ...http.CallOption) (rsp *common.ScripID, err error)
@@ -1552,6 +1581,7 @@ type PartnerHTTPClient interface {
 	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)
 	PartnerGetPersonLikedAndLooked(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.LookedAndLikedNum, err error)
+	PartnerGetRoomBalanceAndTodayBalance(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *PartnerGetRoomBalanceAndTodayBalanceReply, err error)
 	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)
@@ -2045,6 +2075,19 @@ func (c *PartnerHTTPClientImpl) PartnerGetPersonLikedAndLooked(ctx context.Conte
 	return &out, err
 }
 
+func (c *PartnerHTTPClientImpl) PartnerGetRoomBalanceAndTodayBalance(ctx context.Context, in *common.RoomIDRequest, opts ...http.CallOption) (*PartnerGetRoomBalanceAndTodayBalanceReply, error) {
+	var out PartnerGetRoomBalanceAndTodayBalanceReply
+	pattern := "/api/partner/balance/room"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.partner.Partner/PartnerGetRoomBalanceAndTodayBalance"))
+	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) PartnerLike(ctx context.Context, in *common.PersonParam, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/partner/like"

+ 4 - 0
js/api/chat/chat_pb.ts

@@ -1,3 +1,7 @@
+export interface GetRoomProfitReply{
+    /**  房间收益 */
+    roomProfit?:number;
+}
 export interface UserUnlockRequest{
     /**  房间ID */
     roomId?:number;

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

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectIDsRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_pb";
+import {PartnerInfo,PartnerBalance,CreateScripRequest,ReplyScripRequest,PartnerCollectIDsRequest,PartnerCollectRequest,PartnerMessage,LevelTable,PartnerGetAwardRequest,PartnerUpdateWorkingStatusRequest,PartnerApplyWithdrawRequest,PartnerWithdrawTemplateListReply,PartnerWithdrawRecordListReply,PartnerGetRoomBalanceAndTodayBalanceReply,PartnerDBBalance,AddPartnerBalanceRequest} from "./partner_pb";
 import {SendPhoneCodeRequest,CheckPhoneCodeRequest,UpdateInformationRequest,CreateChatRoomParam,PersonParam,HomeInfo,LookedAndLikedNum,ListPageRequest,WxConfReq,WxConfResponse,SexReq,TagListReply,ListPage2Request,RecommendPersonListReply,FindChatRecordListRequest,ChatRecordListReply,FindChatRoomMsgRequest,ChatRoomMsg,IsLike,MemeRequest,MemeList,FindChatTopicRequest,ChatTopicList,RandomNum,CommonTextList,RandomNumAndSex,MemeTitleList,PartnerChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripIdRequest,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PersonIDParam,PersonMsg,PersonIDList,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,PartnerIDParam,AddFriendMessageInfo} from "../common/common_pb";
 import {RoomReply,PartnerFindRoomListReply,FindNotReplyNumReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookMessageReply} from "../statistics/statistics_pb";
@@ -262,6 +262,11 @@ const PartnerService = {
 	const res = await request.post<{ data: PartnerWithdrawRecordListReply, code: string, message: string }>('/api/partner/withdraw/record/list', req);
     return res.data.data;
   },
+  /**  接待员获取房间收益以及今日收益 */
+  PartnerGetRoomBalanceAndTodayBalance: async (req?: RoomIDRequest) => {
+	const res = await request.post<{ data: PartnerGetRoomBalanceAndTodayBalanceReply, code: string, message: string }>('/api/partner/balance/room', req);
+    return res.data.data;
+  },
 
 };
 

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

@@ -1,5 +1,11 @@
 import {Message} from "../common/common_pb";
 
+export interface PartnerGetRoomBalanceAndTodayBalanceReply{
+    /**  今日收益 */
+    todayProfit?:number;
+    /**  房间收益 */
+    roomProfit?:number;
+}
 export interface PartnerCollectIDsRequest{
     /**  记录ID */
     chatRecordIds?:Array<number>;

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov