隐私以及回归奖励

api/user/user.proto

@@ -517,6 +517,34 @@ service User {
       body:"*"
     };
   };
+  // 获取用户是否领取回归奖励
+  rpc IsCanGetReturnReword (google.protobuf.Empty) returns (IsCanGetReturnRewordReply){
+    option (google.api.http) = {
+      post: "/api/user/return/reword/status",
+      body:"*"
+    };
+  };
+  // 用户领取回归奖励
+  rpc UserGetReturnReword (google.protobuf.Empty) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/return/reword/get",
+      body:"*"
+    };
+  };
+  // 用户隐私状态
+  rpc UserPrivacyStatus (google.protobuf.Empty) returns (UserPrivacyStatusInfo){
+    option (google.api.http) = {
+      post: "/api/user/privacy/status",
+      body:"*"
+    };
+  };
+  // 用户设置隐私状态
+  rpc UserSetPrivacyStatus (UserPrivacyStatusInfo) returns (google.protobuf.Empty){
+    option (google.api.http) = {
+      post: "/api/user/privacy/set",
+      body:"*"
+    };
+  };
   // ---manager---
   // 管理员查询用户列表
   rpc ManagerFindUserList (common.ManagerFindPersonListRequest) returns (common.ManagerFindPersonListReply){
@@ -707,6 +735,15 @@ service User {
   rpc MatchUserDBWithoutMap (MatchUserDBWithoutMapRequest) returns (common.PersonDB){};
 }
 
+message UserPrivacyStatusInfo{
+  bool isCloseGreet = 1;// 是否关闭打招呼
+  bool isCloseMatching = 2;// 是否关闭匹配到我
+}
+
+message IsCanGetReturnRewordReply{
+  bool isCanGetReword = 1;
+}
+
 message GetRandomMatchingRequest{
   int64 sex = 4;// 性别
   string province = 7;// 省

api/user/user_grpc.pb.go

@@ -166,6 +166,14 @@ type UserClient interface {
 	GetUserLookHandPickNum(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetUserLookHandPickNumReply, error)
 	// 设置用户查看精选表的次数
 	SetUserLookHandPickNum(ctx context.Context, in *common.PersonIDParam, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 获取用户是否领取回归奖励
+	IsCanGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*IsCanGetReturnRewordReply, error)
+	// 用户领取回归奖励
+	UserGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 用户隐私状态
+	UserPrivacyStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserPrivacyStatusInfo, error)
+	// 用户设置隐私状态
+	UserSetPrivacyStatus(ctx context.Context, in *UserPrivacyStatusInfo, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// ---manager---
 	// 管理员查询用户列表
 	ManagerFindUserList(ctx context.Context, in *common.ManagerFindPersonListRequest, opts ...grpc.CallOption) (*common.ManagerFindPersonListReply, error)
@@ -903,6 +911,42 @@ func (c *userClient) SetUserLookHandPickNum(ctx context.Context, in *common.Pers
 	return out, nil
 }
 
+func (c *userClient) IsCanGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*IsCanGetReturnRewordReply, error) {
+	out := new(IsCanGetReturnRewordReply)
+	err := c.cc.Invoke(ctx, "/api.user.User/IsCanGetReturnReword", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) UserGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserGetReturnReword", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) UserPrivacyStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserPrivacyStatusInfo, error) {
+	out := new(UserPrivacyStatusInfo)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserPrivacyStatus", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) UserSetPrivacyStatus(ctx context.Context, in *UserPrivacyStatusInfo, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
+	err := c.cc.Invoke(ctx, "/api.user.User/UserSetPrivacyStatus", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *userClient) ManagerFindUserList(ctx context.Context, in *common.ManagerFindPersonListRequest, opts ...grpc.CallOption) (*common.ManagerFindPersonListReply, error) {
 	out := new(common.ManagerFindPersonListReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/ManagerFindUserList", in, out, opts...)
@@ -1438,6 +1482,14 @@ type UserServer interface {
 	GetUserLookHandPickNum(context.Context, *emptypb.Empty) (*GetUserLookHandPickNumReply, error)
 	// 设置用户查看精选表的次数
 	SetUserLookHandPickNum(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
+	// 获取用户是否领取回归奖励
+	IsCanGetReturnReword(context.Context, *emptypb.Empty) (*IsCanGetReturnRewordReply, error)
+	// 用户领取回归奖励
+	UserGetReturnReword(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
+	// 用户隐私状态
+	UserPrivacyStatus(context.Context, *emptypb.Empty) (*UserPrivacyStatusInfo, error)
+	// 用户设置隐私状态
+	UserSetPrivacyStatus(context.Context, *UserPrivacyStatusInfo) (*emptypb.Empty, error)
 	// ---manager---
 	// 管理员查询用户列表
 	ManagerFindUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error)
@@ -1746,6 +1798,18 @@ func (UnimplementedUserServer) GetUserLookHandPickNum(context.Context, *emptypb.
 func (UnimplementedUserServer) SetUserLookHandPickNum(context.Context, *common.PersonIDParam) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetUserLookHandPickNum not implemented")
 }
+func (UnimplementedUserServer) IsCanGetReturnReword(context.Context, *emptypb.Empty) (*IsCanGetReturnRewordReply, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IsCanGetReturnReword not implemented")
+}
+func (UnimplementedUserServer) UserGetReturnReword(context.Context, *emptypb.Empty) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserGetReturnReword not implemented")
+}
+func (UnimplementedUserServer) UserPrivacyStatus(context.Context, *emptypb.Empty) (*UserPrivacyStatusInfo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserPrivacyStatus not implemented")
+}
+func (UnimplementedUserServer) UserSetPrivacyStatus(context.Context, *UserPrivacyStatusInfo) (*emptypb.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserSetPrivacyStatus not implemented")
+}
 func (UnimplementedUserServer) ManagerFindUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ManagerFindUserList not implemented")
 }
@@ -3166,6 +3230,78 @@ func _User_SetUserLookHandPickNum_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _User_IsCanGetReturnReword_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.(UserServer).IsCanGetReturnReword(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/IsCanGetReturnReword",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).IsCanGetReturnReword(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_UserGetReturnReword_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.(UserServer).UserGetReturnReword(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/UserGetReturnReword",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UserGetReturnReword(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_UserPrivacyStatus_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.(UserServer).UserPrivacyStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/UserPrivacyStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UserPrivacyStatus(ctx, req.(*emptypb.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_UserSetPrivacyStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserPrivacyStatusInfo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).UserSetPrivacyStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/api.user.User/UserSetPrivacyStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UserSetPrivacyStatus(ctx, req.(*UserPrivacyStatusInfo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _User_ManagerFindUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(common.ManagerFindPersonListRequest)
 	if err := dec(in); err != nil {
@@ -4231,6 +4367,22 @@ var User_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SetUserLookHandPickNum",
 			Handler:    _User_SetUserLookHandPickNum_Handler,
 		},
+		{
+			MethodName: "IsCanGetReturnReword",
+			Handler:    _User_IsCanGetReturnReword_Handler,
+		},
+		{
+			MethodName: "UserGetReturnReword",
+			Handler:    _User_UserGetReturnReword_Handler,
+		},
+		{
+			MethodName: "UserPrivacyStatus",
+			Handler:    _User_UserPrivacyStatus_Handler,
+		},
+		{
+			MethodName: "UserSetPrivacyStatus",
+			Handler:    _User_UserSetPrivacyStatus_Handler,
+		},
 		{
 			MethodName: "ManagerFindUserList",
 			Handler:    _User_ManagerFindUserList_Handler,

api/user/user_http.pb.go

@@ -73,6 +73,7 @@ type UserHTTPServer interface {
 	GetUserRoomByPerson(context.Context, *common.PersonParam) (*chat.UserRoomInfo, error)
 	GetVipInfo(context.Context, *emptypb.Empty) (*VipInfo, error)
 	GetWindowInfo(context.Context, *emptypb.Empty) (*chat.WindowInfo, error)
+	IsCanGetReturnReword(context.Context, *emptypb.Empty) (*IsCanGetReturnRewordReply, error)
 	ManagerDeleteHighQualityUser(context.Context, *common.PersonIDParam) (*emptypb.Empty, error)
 	ManagerFindCanHandpickUserList(context.Context, *common.ManagerFindCanHandpickUserListRequest) (*common.ManagerFindCanHandpickUserListReply, error)
 	ManagerFindHighQualityUserList(context.Context, *common.ManagerFindPersonListRequest) (*common.ManagerFindPersonListReply, error)
@@ -114,11 +115,14 @@ type UserHTTPServer interface {
 	UserGetHomeInfo(context.Context, *common.PersonParam) (*common.HomeInfo, error)
 	UserGetInformationAward(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
 	UserGetPersonLikedAndLooked(context.Context, *common.PersonParam) (*common.LookedAndLikedNum, error)
+	UserGetReturnReword(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
 	UserInformationStatus(context.Context, *emptypb.Empty) (*InformationStatus, error)
 	UserLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
+	UserPrivacyStatus(context.Context, *emptypb.Empty) (*UserPrivacyStatusInfo, error)
 	UserRecharge(context.Context, *UserRechargeRequest) (*PayInfo, error)
 	UserRechargeVip(context.Context, *UserRechargeRequest) (*PayInfo, error)
 	UserSetBlackChat(context.Context, *common.RoomIDRequest) (*emptypb.Empty, error)
+	UserSetPrivacyStatus(context.Context, *UserPrivacyStatusInfo) (*emptypb.Empty, error)
 	UserUnLike(context.Context, *common.PersonParam) (*emptypb.Empty, error)
 	WxConf(context.Context, *common.WxConfReq) (*common.WxConfResponse, error)
 }
@@ -196,6 +200,10 @@ func RegisterUserHTTPServer(s *http.Server, srv UserHTTPServer) {
 	r.POST("/api/handpick/list", _User_FindHandpickUser0_HTTP_Handler(srv))
 	r.POST("/api/user/look/handpick/num", _User_GetUserLookHandPickNum0_HTTP_Handler(srv))
 	r.POST("/api/user/look/handpick/num/set", _User_SetUserLookHandPickNum0_HTTP_Handler(srv))
+	r.POST("/api/user/return/reword/status", _User_IsCanGetReturnReword0_HTTP_Handler(srv))
+	r.POST("/api/user/return/reword/get", _User_UserGetReturnReword0_HTTP_Handler(srv))
+	r.POST("/api/user/privacy/status", _User_UserPrivacyStatus0_HTTP_Handler(srv))
+	r.POST("/api/user/privacy/set", _User_UserSetPrivacyStatus0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list", _User_ManagerFindUserList0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list/information", _User_ManagerFindInformationUserList0_HTTP_Handler(srv))
 	r.POST("/api/manager/user/list/ischeckquality", _User_ManagerFindIsCheckQualityUserList0_HTTP_Handler(srv))
@@ -2135,6 +2143,114 @@ func _User_SetUserLookHandPickNum0_HTTP_Handler(srv UserHTTPServer) func(ctx htt
 	}
 }
 
+func _User_IsCanGetReturnReword0_HTTP_Handler(srv UserHTTPServer) 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.user.User/IsCanGetReturnReword")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.IsCanGetReturnReword(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)
+	}
+}
+
+func _User_UserGetReturnReword0_HTTP_Handler(srv UserHTTPServer) 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.user.User/UserGetReturnReword")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.UserGetReturnReword(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)
+	}
+}
+
+func _User_UserPrivacyStatus0_HTTP_Handler(srv UserHTTPServer) 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.user.User/UserPrivacyStatus")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.UserPrivacyStatus(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)
+	}
+}
+
+func _User_UserSetPrivacyStatus0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
+	return func(ctx http.Context) error {
+		var in UserPrivacyStatusInfo
+		if err := ctx.Bind(&in); err != nil {
+			return err
+		}
+		if err := ctx.BindQuery(&in); err != nil {
+			return err
+		}
+		http.SetOperation(ctx, "/api.user.User/UserSetPrivacyStatus")
+		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
+			return srv.UserSetPrivacyStatus(ctx, req.(*UserPrivacyStatusInfo))
+		})
+		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 _User_ManagerFindUserList0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
 		var in common.ManagerFindPersonListRequest
@@ -2719,6 +2835,7 @@ type UserHTTPClient interface {
 	GetUserRoomByPerson(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *chat.UserRoomInfo, err error)
 	GetVipInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *VipInfo, err error)
 	GetWindowInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *chat.WindowInfo, err error)
+	IsCanGetReturnReword(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *IsCanGetReturnRewordReply, err error)
 	ManagerDeleteHighQualityUser(ctx context.Context, req *common.PersonIDParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	ManagerFindCanHandpickUserList(ctx context.Context, req *common.ManagerFindCanHandpickUserListRequest, opts ...http.CallOption) (rsp *common.ManagerFindCanHandpickUserListReply, err error)
 	ManagerFindHighQualityUserList(ctx context.Context, req *common.ManagerFindPersonListRequest, opts ...http.CallOption) (rsp *common.ManagerFindPersonListReply, err error)
@@ -2760,11 +2877,14 @@ type UserHTTPClient interface {
 	UserGetHomeInfo(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.HomeInfo, err error)
 	UserGetInformationAward(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UserGetPersonLikedAndLooked(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *common.LookedAndLikedNum, err error)
+	UserGetReturnReword(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UserInformationStatus(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *InformationStatus, err error)
 	UserLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	UserPrivacyStatus(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserPrivacyStatusInfo, err error)
 	UserRecharge(ctx context.Context, req *UserRechargeRequest, opts ...http.CallOption) (rsp *PayInfo, err error)
 	UserRechargeVip(ctx context.Context, req *UserRechargeRequest, opts ...http.CallOption) (rsp *PayInfo, err error)
 	UserSetBlackChat(ctx context.Context, req *common.RoomIDRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
+	UserSetPrivacyStatus(ctx context.Context, req *UserPrivacyStatusInfo, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	UserUnLike(ctx context.Context, req *common.PersonParam, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 	WxConf(ctx context.Context, req *common.WxConfReq, opts ...http.CallOption) (rsp *common.WxConfResponse, err error)
 }
@@ -3336,6 +3456,19 @@ func (c *UserHTTPClientImpl) GetWindowInfo(ctx context.Context, in *emptypb.Empt
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) IsCanGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*IsCanGetReturnRewordReply, error) {
+	var out IsCanGetReturnRewordReply
+	pattern := "/api/user/return/reword/status"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/IsCanGetReturnReword"))
+	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 *UserHTTPClientImpl) ManagerDeleteHighQualityUser(ctx context.Context, in *common.PersonIDParam, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/manager/quality/user/delete"
@@ -3869,6 +4002,19 @@ func (c *UserHTTPClientImpl) UserGetPersonLikedAndLooked(ctx context.Context, in
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) UserGetReturnReword(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/user/return/reword/get"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/UserGetReturnReword"))
+	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 *UserHTTPClientImpl) UserInformationStatus(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*InformationStatus, error) {
 	var out InformationStatus
 	pattern := "/api/user/information/status"
@@ -3895,6 +4041,19 @@ func (c *UserHTTPClientImpl) UserLike(ctx context.Context, in *common.PersonPara
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) UserPrivacyStatus(ctx context.Context, in *emptypb.Empty, opts ...http.CallOption) (*UserPrivacyStatusInfo, error) {
+	var out UserPrivacyStatusInfo
+	pattern := "/api/user/privacy/status"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/UserPrivacyStatus"))
+	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 *UserHTTPClientImpl) UserRecharge(ctx context.Context, in *UserRechargeRequest, opts ...http.CallOption) (*PayInfo, error) {
 	var out PayInfo
 	pattern := "/api/user/recharge"
@@ -3934,6 +4093,19 @@ func (c *UserHTTPClientImpl) UserSetBlackChat(ctx context.Context, in *common.Ro
 	return &out, err
 }
 
+func (c *UserHTTPClientImpl) UserSetPrivacyStatus(ctx context.Context, in *UserPrivacyStatusInfo, opts ...http.CallOption) (*emptypb.Empty, error) {
+	var out emptypb.Empty
+	pattern := "/api/user/privacy/set"
+	path := binding.EncodeURL(pattern, in, false)
+	opts = append(opts, http.Operation("/api.user.User/UserSetPrivacyStatus"))
+	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 *UserHTTPClientImpl) UserUnLike(ctx context.Context, in *common.PersonParam, opts ...http.CallOption) (*emptypb.Empty, error) {
 	var out emptypb.Empty
 	pattern := "/api/user/unlike"

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,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetRandomMatchingRequest,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,MatchUserDBWithoutMapRequest} from "./user_pb";
+import {UserInfo,UserBalance,UserFindChatListReply,CreateScripRequest,DeleteScripRequest,UserFindScripRequest,PersonLookScripRequest,ReplyScripRequest,KeyRequest,InformationStatus,UserRechargeRequest,PayInfo,RechargeList,VipRechargeList,FindPayOrderListRequest,PayOrderList,FindMatchingAvatarAndNumReply,UserFreeNum,GetRandomMatchingRequest,SendMessageRequest,VipInfo,GetUserLookHandPickNumReply,IsCanGetReturnRewordReply,UserPrivacyStatusInfo,ManagerFindIsCheckQualityUserListRequest,ManagerMarkHighQualityUserRequest,ManagerReMarkHighQualityUserRequest,ManagerUpdateUserCreditRequest,FindRecommendHighQualityUserRequest,FindRecommendHighQualityUserReply,GetUserDBMsgFromWebsocketReply,SendMsgReduceCreditRequest,SendNewMessageUnreadReminderRequest,UpdateUserMatchedNumRequest,UpdateUserMatchedNumAndReturnUserMsgReply,GetRecommendUserDBRequest,ReportUserBlackRequest,AddUserCreditRequest,UserGetInformationAwardByActivityRequest,UserGetInformationAwardByActivityReply,FindUserVipListDBReply,MatchUserDBWithoutMapRequest} 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,HandpickPersonListReply,PersonIDParam,ManagerFindPersonListRequest,ManagerFindPersonListReply,ManagerFindPersonListReply2,ManagerFindCanHandpickUserListRequest,ManagerFindCanHandpickUserListReply,ManagerSetHandpickUserRequest,ManagerSetHandpickUserOneRequest,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";
@@ -363,6 +363,26 @@ const UserService = {
 	const res = await request.post('/api/user/look/handpick/num/set', req);
     return res.data.data;
   },
+  /**  获取用户是否领取回归奖励 */
+  IsCanGetReturnReword: async (req?: undefined) => {
+	const res = await request.post<{ data: IsCanGetReturnRewordReply, code: string, message: string }>('/api/user/return/reword/status', req);
+    return res.data.data;
+  },
+  /**  用户领取回归奖励 */
+  UserGetReturnReword: async (req?: undefined) => {
+	const res = await request.post('/api/user/return/reword/get', req);
+    return res.data.data;
+  },
+  /**  用户隐私状态 */
+  UserPrivacyStatus: async (req?: undefined) => {
+	const res = await request.post<{ data: UserPrivacyStatusInfo, code: string, message: string }>('/api/user/privacy/status', req);
+    return res.data.data;
+  },
+  /**  用户设置隐私状态 */
+  UserSetPrivacyStatus: async (req?: UserPrivacyStatusInfo) => {
+	const res = await request.post('/api/user/privacy/set', req);
+    return res.data.data;
+  },
   /**  ---manager---
 // 管理员查询用户列表 */
   ManagerFindUserList: async (req?: ManagerFindPersonListRequest) => {

js/api/user/user_pb.ts

@@ -1,5 +1,14 @@
 import {Message} from "../common/common_pb";
 
+export interface UserPrivacyStatusInfo{
+    /**  是否关闭打招呼 */
+    isCloseGreet?:boolean;
+    /**  是否关闭匹配到我 */
+    isCloseMatching?:boolean;
+}
+export interface IsCanGetReturnRewordReply{
+    isCanGetReword?:boolean;
+}
 export interface GetRandomMatchingRequest{
     /**  性别 */
     sex?:number;