爆灯

api/user/user.proto

@@ -609,7 +609,7 @@ service User {
   // 获取用户详情websocket专用
   rpc GetUserDBMsgFromWebsocket (common.PersonIDParam) returns (GetUserDBMsgFromWebsocketReply);
   // 发送消息扣费
-  rpc SendMsgReduceCredit (common.PersonParam) returns (google.protobuf.Empty);
+  rpc SendMsgReduceCredit (SendMsgReduceCreditRequest) returns (google.protobuf.Empty);
   // 回看纸条扣费
   rpc LookBackScripReduceCredit (common.PersonParam) returns (google.protobuf.Empty);
   // 发纸条扣费
@@ -636,6 +636,12 @@ service User {
   rpc UserGetInformationAwardByActivity (UserGetInformationAwardByActivityRequest) returns (UserGetInformationAwardByActivityReply){};
 }
 
+message SendMsgReduceCreditRequest{
+  string personID = 1; // 查询目标的ID
+  bool isFree = 2;// 是否免费
+  string type = 3; // 消息类型
+}
+
 message UserGetInformationAwardByActivityRequest{
   string userId = 1;
   int64 credit = 2;

api/user/user_grpc.pb.go

@@ -206,7 +206,7 @@ type UserClient interface {
 	// 获取用户详情websocket专用
 	GetUserDBMsgFromWebsocket(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*GetUserDBMsgFromWebsocketReply, error)
 	// 发送消息扣费
-	SendMsgReduceCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	SendMsgReduceCredit(ctx context.Context, in *SendMsgReduceCreditRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 回看纸条扣费
 	LookBackScripReduceCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// 发纸条扣费
@@ -1042,7 +1042,7 @@ func (c *userClient) GetUserDBMsgFromWebsocket(ctx context.Context, in *common.P
 	return out, nil
 }
 
-func (c *userClient) SendMsgReduceCredit(ctx context.Context, in *common.PersonParam, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+func (c *userClient) SendMsgReduceCredit(ctx context.Context, in *SendMsgReduceCreditRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/api.user.User/SendMsgReduceCredit", in, out, opts...)
 	if err != nil {
@@ -1347,7 +1347,7 @@ type UserServer interface {
 	// 获取用户详情websocket专用
 	GetUserDBMsgFromWebsocket(context.Context, *common.PersonIDParam) (*GetUserDBMsgFromWebsocketReply, error)
 	// 发送消息扣费
-	SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error)
+	SendMsgReduceCredit(context.Context, *SendMsgReduceCreditRequest) (*emptypb.Empty, error)
 	// 回看纸条扣费
 	LookBackScripReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	// 发纸条扣费
@@ -1646,7 +1646,7 @@ func (UnimplementedUserServer) FindRecommendHighQualityUserDBList(context.Contex
 func (UnimplementedUserServer) GetUserDBMsgFromWebsocket(context.Context, *common.PersonIDParam) (*GetUserDBMsgFromWebsocketReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserDBMsgFromWebsocket not implemented")
 }
-func (UnimplementedUserServer) SendMsgReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error) {
+func (UnimplementedUserServer) SendMsgReduceCredit(context.Context, *SendMsgReduceCreditRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendMsgReduceCredit not implemented")
 }
 func (UnimplementedUserServer) LookBackScripReduceCredit(context.Context, *common.PersonParam) (*emptypb.Empty, error) {
@@ -3301,7 +3301,7 @@ func _User_GetUserDBMsgFromWebsocket_Handler(srv interface{}, ctx context.Contex
 }
 
 func _User_SendMsgReduceCredit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.PersonParam)
+	in := new(SendMsgReduceCreditRequest)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -3313,7 +3313,7 @@ func _User_SendMsgReduceCredit_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/api.user.User/SendMsgReduceCredit",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).SendMsgReduceCredit(ctx, req.(*common.PersonParam))
+		return srv.(UserServer).SendMsgReduceCredit(ctx, req.(*SendMsgReduceCreditRequest))
 	}
 	return interceptor(ctx, in, info, handler)
 }

errors/chat.go

@@ -15,4 +15,6 @@ var (
 	ErrorChatRecordNotExist     = codes.Error(40010, "聊天记录不存在")
 	ErrorRandomMatchingFail     = codes.Error(40011, "随机匹配失败")
 	ErrorBlack2                 = codes.Error(40012, "你拉黑了对方")
+	ErrorSuperLove              = codes.Error(40013, "已经超喜欢过对方")
+	ErrorTodaySuperLoveLimit    = codes.Error(40013, "今日超喜欢次数已达上限")
 )

errors/common.go

@@ -34,4 +34,5 @@ var (
 	ErrorWebsocketClose        = codes.Error(10027, "已离线")
 	ErrorNickNameHaveEmpty     = codes.Error(10028, "昵称开头或结尾包含空格")
 	ErrorPictureFail           = codes.Error(10029, "发布失败，图片内容涉嫌违规，请修改~")
+	ErrorSubscribeNotEnough    = codes.Error(10030, "订阅消息可发送次数不足")
 )

js/api/user/user_http_pb.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 import request from '@/libs/request';
-import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,SendMessageRequest,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply} from "./user_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,ChatCardInfo,ReportChatRequest,FindOverSevenDayAvatarReply,UpdateLastScripIDRequest,ScripID,ScripReply,FindScripRequest,ScripInfo,ChatRecordInfo,RoomIDRequest,PartnerIDParam,AddFriendMessageInfo,SendMessageReply,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,PersonIDParam,PersonIDList,ManagerUpdatePersonVoiceRequest,ManagerUpdatePersonPicturesRequest,ManagerUpdatePersonSignatureRequest,ManagerUpdatePersonAvatarRequest,ManagerUpdatePersonNameRequest,ManagerUpdatePersonWeightRequest,ManagerUpdatePersonIsBlackRequest,PersonMsg,PersonDBReply,UpdateLastScripIDDBRequest,FindRecommendRequest,IDParam,PersonDB} from "../common/common_pb";
 import {RoomReply,UnreadNumReply,UserRoomInfo,CheckUserPartnerIsRelationshipReply,WindowInfo,GetRandomMatchingReply} from "../chat/chat_pb";
 import {LookAndLikeListReply,LookAndLikeMessageReply,LookMessageReply} from "../statistics/statistics_pb";

js/api/user/user_pb.ts

@@ -1,5 +1,13 @@
 import {Message} from "../common/common_pb";
 
+export interface SendMsgReduceCreditRequest{
+    /**  查询目标的ID */
+    personID?:string;
+    /**  是否免费 */
+    isFree?:boolean;
+    /**  消息类型 */
+    type?:string;
+}
 export interface UserGetInformationAwardByActivityRequest{
     userId?:string;
     credit?:number;