commit

rpc/integral.proto

@@ -45,9 +45,9 @@ message Point {
     string serialNumber=11;
 }
 message mergeInfo{
-     mergeUser=1;//合并用户
-     mergedUser=2;//被合并用户
-     appId=3;//身份标识
+     string mergeUser=1;//合并用户
+     string mergedUser=2;//被合并用户
+     string appId=3;//身份标识
 }
 service Integral {
   //收获积分

rpc/integral/integral.pb.go

@@ -441,6 +441,69 @@ func (x *Point) GetSerialNumber() string {
 	return ""
 }
 
+type MergeInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	MergeUser  string `protobuf:"bytes,1,opt,name=mergeUser,proto3" json:"mergeUser,omitempty"`   //合并用户
+	MergedUser string `protobuf:"bytes,2,opt,name=mergedUser,proto3" json:"mergedUser,omitempty"` //被合并用户
+	AppId      string `protobuf:"bytes,3,opt,name=appId,proto3" json:"appId,omitempty"`           //身份标识
+}
+
+func (x *MergeInfo) Reset() {
+	*x = MergeInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_integral_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MergeInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MergeInfo) ProtoMessage() {}
+
+func (x *MergeInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_integral_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MergeInfo.ProtoReflect.Descriptor instead.
+func (*MergeInfo) Descriptor() ([]byte, []int) {
+	return file_integral_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *MergeInfo) GetMergeUser() string {
+	if x != nil {
+		return x.MergeUser
+	}
+	return ""
+}
+
+func (x *MergeInfo) GetMergedUser() string {
+	if x != nil {
+		return x.MergedUser
+	}
+	return ""
+}
+
+func (x *MergeInfo) GetAppId() string {
+	if x != nil {
+		return x.AppId
+	}
+	return ""
+}
+
 var File_integral_proto protoreflect.FileDescriptor
 
 var file_integral_proto_rawDesc = []byte{
@@ -501,28 +564,37 @@ var file_integral_proto_rawDesc = []byte{
 	0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74,
 	0x12, 0x22, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
 	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x32, 0xc7, 0x02, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x12, 0x30, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x48, 0x61, 0x72,
-	0x76, 0x65, 0x73, 0x74, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
-	0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x0d, 0x2e,
-	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x15,
-	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x2e, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
-	0x52, 0x65, 0x73, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65,
-	0x67, 0x72, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x72, 0x64, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65,
-	0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x13, 0x69, 0x6e, 0x74, 0x65,
-	0x67, 0x72, 0x61, 0x6c, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12,
-	0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6d, 0x62, 0x65, 0x72, 0x22, 0x5f, 0x0a, 0x09, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x55, 0x73, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12,
+	0x1e, 0x0a, 0x0a, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x12,
+	0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x61, 0x70, 0x70, 0x49, 0x64, 0x32, 0xf9, 0x02, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x12, 0x30, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x48, 0x61,
+	0x72, 0x76, 0x65, 0x73, 0x74, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x35, 0x0a, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x0d,
+	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a,
+	0x15, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65,
+	0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
+	0x2e, 0x52, 0x65, 0x73, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2e, 0x0a, 0x0d, 0x69, 0x6e, 0x74,
+	0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x72, 0x64, 0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74,
+	0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x13, 0x69, 0x6e, 0x74,
+	0x65, 0x67, 0x72, 0x61, 0x6c, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x12, 0x0d, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x71, 0x1a,
+	0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x30, 0x0a, 0x09, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x12, 0x13, 0x2e, 0x69,
+	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x1a, 0x0e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x52, 0x65, 0x73,
+	0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -537,12 +609,13 @@ func file_integral_proto_rawDescGZIP() []byte {
 	return file_integral_proto_rawDescData
 }
 
-var file_integral_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_integral_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_integral_proto_goTypes = []interface{}{
-	(*Req)(nil),      // 0: integral.Req
-	(*Resp)(nil),     // 1: integral.Resp
-	(*RespList)(nil), // 2: integral.RespList
-	(*Point)(nil),    // 3: integral.Point
+	(*Req)(nil),       // 0: integral.Req
+	(*Resp)(nil),      // 1: integral.Resp
+	(*RespList)(nil),  // 2: integral.RespList
+	(*Point)(nil),     // 3: integral.Point
+	(*MergeInfo)(nil), // 4: integral.mergeInfo
 }
 var file_integral_proto_depIdxs = []int32{
 	3, // 0: integral.RespList.data:type_name -> integral.Point
@@ -552,14 +625,16 @@ var file_integral_proto_depIdxs = []int32{
 	0, // 4: integral.Integral.integralDetailedCheck:input_type -> integral.Req
 	0, // 5: integral.Integral.integralGuard:input_type -> integral.Req
 	0, // 6: integral.Integral.integralExpireCheck:input_type -> integral.Req
-	1, // 7: integral.Integral.integralHarvest:output_type -> integral.Resp
-	1, // 8: integral.Integral.integralConsume:output_type -> integral.Resp
-	1, // 9: integral.Integral.integralBalanceCheck:output_type -> integral.Resp
-	2, // 10: integral.Integral.integralDetailedCheck:output_type -> integral.RespList
-	1, // 11: integral.Integral.integralGuard:output_type -> integral.Resp
-	1, // 12: integral.Integral.integralExpireCheck:output_type -> integral.Resp
-	7, // [7:13] is the sub-list for method output_type
-	1, // [1:7] is the sub-list for method input_type
+	4, // 7: integral.Integral.UserMerge:input_type -> integral.mergeInfo
+	1, // 8: integral.Integral.integralHarvest:output_type -> integral.Resp
+	1, // 9: integral.Integral.integralConsume:output_type -> integral.Resp
+	1, // 10: integral.Integral.integralBalanceCheck:output_type -> integral.Resp
+	2, // 11: integral.Integral.integralDetailedCheck:output_type -> integral.RespList
+	1, // 12: integral.Integral.integralGuard:output_type -> integral.Resp
+	1, // 13: integral.Integral.integralExpireCheck:output_type -> integral.Resp
+	1, // 14: integral.Integral.UserMerge:output_type -> integral.Resp
+	8, // [8:15] is the sub-list for method output_type
+	1, // [1:8] is the sub-list for method input_type
 	1, // [1:1] is the sub-list for extension type_name
 	1, // [1:1] is the sub-list for extension extendee
 	0, // [0:1] is the sub-list for field type_name
@@ -619,6 +694,18 @@ func file_integral_proto_init() {
 				return nil
 			}
 		}
+		file_integral_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MergeInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -626,7 +713,7 @@ func file_integral_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_integral_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -664,6 +751,8 @@ type IntegralClient interface {
 	IntegralGuard(ctx context.Context, in *Req, opts ...grpc.CallOption) (*Resp, error)
 	//到期积分查询
 	IntegralExpireCheck(ctx context.Context, in *Req, opts ...grpc.CallOption) (*Resp, error)
+	//合并账号
+	UserMerge(ctx context.Context, in *MergeInfo, opts ...grpc.CallOption) (*Resp, error)
 }
 
 type integralClient struct {
@@ -728,6 +817,15 @@ func (c *integralClient) IntegralExpireCheck(ctx context.Context, in *Req, opts
 	return out, nil
 }
 
+func (c *integralClient) UserMerge(ctx context.Context, in *MergeInfo, opts ...grpc.CallOption) (*Resp, error) {
+	out := new(Resp)
+	err := c.cc.Invoke(ctx, "/integral.Integral/UserMerge", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // IntegralServer is the server API for Integral service.
 type IntegralServer interface {
 	//收获积分
@@ -742,6 +840,8 @@ type IntegralServer interface {
 	IntegralGuard(context.Context, *Req) (*Resp, error)
 	//到期积分查询
 	IntegralExpireCheck(context.Context, *Req) (*Resp, error)
+	//合并账号
+	UserMerge(context.Context, *MergeInfo) (*Resp, error)
 }
 
 // UnimplementedIntegralServer can be embedded to have forward compatible implementations.
@@ -766,6 +866,9 @@ func (*UnimplementedIntegralServer) IntegralGuard(context.Context, *Req) (*Resp,
 func (*UnimplementedIntegralServer) IntegralExpireCheck(context.Context, *Req) (*Resp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method IntegralExpireCheck not implemented")
 }
+func (*UnimplementedIntegralServer) UserMerge(context.Context, *MergeInfo) (*Resp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserMerge not implemented")
+}
 
 func RegisterIntegralServer(s *grpc.Server, srv IntegralServer) {
 	s.RegisterService(&_Integral_serviceDesc, srv)
@@ -879,6 +982,24 @@ func _Integral_IntegralExpireCheck_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Integral_UserMerge_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MergeInfo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(IntegralServer).UserMerge(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/integral.Integral/UserMerge",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(IntegralServer).UserMerge(ctx, req.(*MergeInfo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _Integral_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "integral.Integral",
 	HandlerType: (*IntegralServer)(nil),
@@ -907,6 +1028,10 @@ var _Integral_serviceDesc = grpc.ServiceDesc{
 			MethodName: "integralExpireCheck",
 			Handler:    _Integral_IntegralExpireCheck_Handler,
 		},
+		{
+			MethodName: "UserMerge",
+			Handler:    _Integral_UserMerge_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "integral.proto",

rpc/integralclient/integral.go

@@ -14,10 +14,11 @@ import (
 )
 
 type (
-	Req      = integral.Req
-	Resp     = integral.Resp
-	RespList = integral.RespList
-	Point    = integral.Point
+	MergeInfo = integral.MergeInfo
+	Req       = integral.Req
+	Resp      = integral.Resp
+	RespList  = integral.RespList
+	Point     = integral.Point
 
 	Integral interface {
 		// 收获积分
@@ -32,6 +33,8 @@ type (
 		IntegralGuard(ctx context.Context, in *Req) (*Resp, error)
 		// 到期积分查询
 		IntegralExpireCheck(ctx context.Context, in *Req) (*Resp, error)
+		// 合并账号
+		UserMerge(ctx context.Context, in *MergeInfo) (*Resp, error)
 	}
 
 	defaultIntegral struct {
@@ -80,3 +83,9 @@ func (m *defaultIntegral) IntegralExpireCheck(ctx context.Context, in *Req) (*Re
 	client := integral.NewIntegralClient(m.cli.Conn())
 	return client.IntegralExpireCheck(ctx, in)
 }
+
+// 合并账号
+func (m *defaultIntegral) UserMerge(ctx context.Context, in *MergeInfo) (*Resp, error) {
+	client := integral.NewIntegralClient(m.cli.Conn())
+	return client.UserMerge(ctx, in)
+}

rpc/internal/logic/usermergelogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"context"
+
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
+
+	"github.com/tal-tech/go-zero/core/logx"
+)
+
+type UserMergeLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewUserMergeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserMergeLogic {
+	return &UserMergeLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// 合并账号
+func (l *UserMergeLogic) UserMerge(in *integral.MergeInfo) (*integral.Resp, error) {
+	// todo: add your logic here and delete this line
+
+	return &integral.Resp{}, nil
+}

rpc/internal/server/integralserver.go

@@ -56,3 +56,9 @@ func (s *IntegralServer) IntegralExpireCheck(ctx context.Context, in *integral.R
 	l := logic.NewIntegralExpireCheckLogic(ctx, s.svcCtx)
 	return l.IntegralExpireCheck(in)
 }
+
+// 合并账号
+func (s *IntegralServer) UserMerge(ctx context.Context, in *integral.MergeInfo) (*integral.Resp, error) {
+	l := logic.NewUserMergeLogic(ctx, s.svcCtx)
+	return l.UserMerge(in)
+}