Merge branch 'jng-code-0112'

api/accountFiee/accountFiee.proto

@@ -66,6 +66,8 @@ service AccountFiee {
   rpc SendNationMsg (SendNationMsgRequest) returns (SendMsgStatusResponse) {} //发送境外国际短信验证码 --艺术商城
   rpc VerifySliderStatus(VerifySliderStatusRequest) returns (VerifySliderStatusResponse) {}// 验证滑块验证码状态
   rpc SendNationTemplateMsg (SendNationMsgRequest) returns (SendMsgStatusResponse) {} //发送境外国际短信验证码 --艺术商城
+  rpc GetInviterInfo(InviterInfoRequest) returns(InviterInfoResponse) {} //获取邀请人信息
+  rpc GetInviterList(InviterListRequest) returns(InviterListResponse) {} //获取邀请人信息
 
 
   rpc CreateUserAndRealName (CreateUserAndRealNameRequest) returns (CreateUserAndRealNameResponse) {}// 创建用户并实名, 自动导入
@@ -101,7 +103,21 @@ service AccountFiee {
   rpc GetChatAutoReplyRulerDetail ( GetChatAutoReplyRulerByIdRequest )returns( ChatAutoReplyRulerData ){}   //查询自动回复规则详情
   rpc GetChatAutoReplyRulerList ( GetChatAutoReplyRulerListRequest )returns( GetChatAutoReplyRulerListResp ){}   //查询自动回复规则列表
 }
-
+message InviterListRequest{
+  repeated uint64 ids =1;
+}
+message InviterListResponse{
+  repeated InviterInfoResponse list = 1;
+}
+message InviterInfoRequest{
+  string code = 1;
+}
+message InviterInfoResponse{
+  uint64 id = 1;
+  string code = 2;
+  string name = 3;
+  string telNum = 4;
+}
 message VerifySliderStatusRequest {
   string nonceStr = 1;
 }
@@ -186,6 +202,8 @@ message UserListInfo{
   string email = 24;
   string AbroadTelAreaCode = 25;
   string AbroadTel = 26;
+  string inviterName = 27;
+  string inviterCode = 28;
 }
 message UserListRequest{
   string domain = 1;
@@ -227,6 +245,7 @@ message UserInfoResponse{
   string email = 22;
   string AbroadTelAreaCode = 23;
   string AbroadTel = 24;
+  uint64 inviterId = 25;
 
 }
 message RealNameResponse{
@@ -642,6 +661,8 @@ message RegistRequest {
   string telAreaCode = 5;
   string language = 6;
   string nickName = 7;
+  uint64 inviterID = 8;
+  string inviterCode = 9;
 }
 
 message LoginRequest {

api/accountFiee/accountFiee.validator.pb.go

@@ -17,6 +17,25 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+func (this *InviterListRequest) Validate() error {
+	return nil
+}
+func (this *InviterListResponse) Validate() error {
+	for _, item := range this.List {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("List", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *InviterInfoRequest) Validate() error {
+	return nil
+}
+func (this *InviterInfoResponse) Validate() error {
+	return nil
+}
 func (this *VerifySliderStatusRequest) Validate() error {
 	return nil
 }

api/accountFiee/accountFiee_triple.pb.go

@@ -70,6 +70,8 @@ type AccountFieeClient interface {
 	SendNationMsg(ctx context.Context, in *SendNationMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
 	VerifySliderStatus(ctx context.Context, in *VerifySliderStatusRequest, opts ...grpc_go.CallOption) (*VerifySliderStatusResponse, common.ErrorWithAttachment)
 	SendNationTemplateMsg(ctx context.Context, in *SendNationMsgRequest, opts ...grpc_go.CallOption) (*SendMsgStatusResponse, common.ErrorWithAttachment)
+	GetInviterInfo(ctx context.Context, in *InviterInfoRequest, opts ...grpc_go.CallOption) (*InviterInfoResponse, common.ErrorWithAttachment)
+	GetInviterList(ctx context.Context, in *InviterListRequest, opts ...grpc_go.CallOption) (*InviterListResponse, common.ErrorWithAttachment)
 	CreateUserAndRealName(ctx context.Context, in *CreateUserAndRealNameRequest, opts ...grpc_go.CallOption) (*CreateUserAndRealNameResponse, common.ErrorWithAttachment)
 	// submit info
 	SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
@@ -148,6 +150,8 @@ type AccountFieeClientImpl struct {
 	SendNationMsg                 func(ctx context.Context, in *SendNationMsgRequest) (*SendMsgStatusResponse, error)
 	VerifySliderStatus            func(ctx context.Context, in *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
 	SendNationTemplateMsg         func(ctx context.Context, in *SendNationMsgRequest) (*SendMsgStatusResponse, error)
+	GetInviterInfo                func(ctx context.Context, in *InviterInfoRequest) (*InviterInfoResponse, error)
+	GetInviterList                func(ctx context.Context, in *InviterListRequest) (*InviterListResponse, error)
 	CreateUserAndRealName         func(ctx context.Context, in *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error)
 	SaveSubmitInfo                func(ctx context.Context, in *SubmitInfoRequest) (*CommonResponse, error)
 	CreateChatUser                func(ctx context.Context, in *ChatUserData) (*CreateChatUserResp, error)
@@ -436,6 +440,18 @@ func (c *accountFieeClient) SendNationTemplateMsg(ctx context.Context, in *SendN
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SendNationTemplateMsg", in, out)
 }
 
+func (c *accountFieeClient) GetInviterInfo(ctx context.Context, in *InviterInfoRequest, opts ...grpc_go.CallOption) (*InviterInfoResponse, common.ErrorWithAttachment) {
+	out := new(InviterInfoResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInviterInfo", in, out)
+}
+
+func (c *accountFieeClient) GetInviterList(ctx context.Context, in *InviterListRequest, opts ...grpc_go.CallOption) (*InviterListResponse, common.ErrorWithAttachment) {
+	out := new(InviterListResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInviterList", in, out)
+}
+
 func (c *accountFieeClient) CreateUserAndRealName(ctx context.Context, in *CreateUserAndRealNameRequest, opts ...grpc_go.CallOption) (*CreateUserAndRealNameResponse, common.ErrorWithAttachment) {
 	out := new(CreateUserAndRealNameResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -650,6 +666,8 @@ type AccountFieeServer interface {
 	SendNationMsg(context.Context, *SendNationMsgRequest) (*SendMsgStatusResponse, error)
 	VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
 	SendNationTemplateMsg(context.Context, *SendNationMsgRequest) (*SendMsgStatusResponse, error)
+	GetInviterInfo(context.Context, *InviterInfoRequest) (*InviterInfoResponse, error)
+	GetInviterList(context.Context, *InviterListRequest) (*InviterListResponse, error)
 	CreateUserAndRealName(context.Context, *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error)
 	// submit info
 	SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error)
@@ -811,6 +829,12 @@ func (UnimplementedAccountFieeServer) VerifySliderStatus(context.Context, *Verif
 func (UnimplementedAccountFieeServer) SendNationTemplateMsg(context.Context, *SendNationMsgRequest) (*SendMsgStatusResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendNationTemplateMsg not implemented")
 }
+func (UnimplementedAccountFieeServer) GetInviterInfo(context.Context, *InviterInfoRequest) (*InviterInfoResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetInviterInfo not implemented")
+}
+func (UnimplementedAccountFieeServer) GetInviterList(context.Context, *InviterListRequest) (*InviterListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetInviterList not implemented")
+}
 func (UnimplementedAccountFieeServer) CreateUserAndRealName(context.Context, *CreateUserAndRealNameRequest) (*CreateUserAndRealNameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserAndRealName not implemented")
 }
@@ -2112,6 +2136,64 @@ func _AccountFiee_SendNationTemplateMsg_Handler(srv interface{}, ctx context.Con
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AccountFiee_GetInviterInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InviterInfoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetInviterInfo", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _AccountFiee_GetInviterList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(InviterListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetInviterList", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _AccountFiee_CreateUserAndRealName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateUserAndRealNameRequest)
 	if err := dec(in); err != nil {
@@ -3095,6 +3177,14 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "SendNationTemplateMsg",
 			Handler:    _AccountFiee_SendNationTemplateMsg_Handler,
 		},
+		{
+			MethodName: "GetInviterInfo",
+			Handler:    _AccountFiee_GetInviterInfo_Handler,
+		},
+		{
+			MethodName: "GetInviterList",
+			Handler:    _AccountFiee_GetInviterList_Handler,
+		},
 		{
 			MethodName: "CreateUserAndRealName",
 			Handler:    _AccountFiee_CreateUserAndRealName_Handler,

api/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.5
-// - protoc             v5.26.0
+// - protoc             v6.32.0
 // source: pb/bundle.proto
 
 package bundle

pkg/middleware/check_login.go

@@ -70,6 +70,7 @@ func CheckLogin(provider *api.AccountFieeClientImpl) gin.HandlerFunc {
 			TelNum:             jwt.Phone,
 			SubscriberNumber:   infoRes.SubscriberNumber,
 			IdNumber:           infoRes.IdNumber,
+			InviterID:          infoRes.InviterId,
 		}
 
 		ctx.Set("jwtInfo", loginInfo)

pkg/model/login/login.go

@@ -29,6 +29,7 @@ type Info struct {
 	TelNum             string `json:"telNum"`
 	SubscriberNumber   string `json:"subscriberNumber"`
 	IdNumber           string `json:"idNumber"`
+	InviterID          uint64 `json:"inviterId"`
 }
 
 func GetUserInfoFromC(c *gin.Context) Info {

pkg/router/router.go

@@ -70,6 +70,7 @@ func NewRouter() *gin.Engine {
 		privateGroup.POST("user/check/msg", account.CheckMsg)          //校验验证码
 		privateGroup.POST("generate/captcha", account.GenerateCaptcha) //生成滑块验证码
 		privateGroup.POST("validate/captcha", account.ValidateCaptcha) //验证滑块验证码
+		privateGroup.POST("check/register", account.CheckRegister)     //校验是否注册
 		acRoute := privateGroup.Group("/user")
 		acRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
 		{

pkg/service/account/account.go

@@ -440,6 +440,31 @@ func ValidateCaptcha(c *gin.Context) {
 	service.Success(c, res)
 
 }
+func CheckRegister(c *gin.Context) {
+	type CheckRegisterRes struct {
+		IsRegister bool `json:"is_register"`
+	}
+	req := account.UserByTelRequest{}
+	req.Domain = "app"
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	data, err := service.AccountFieeProvider.UserByTel(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+	var res CheckRegisterRes
+	if data.Id == 0 {
+		res.IsRegister = false
+	} else {
+		res.IsRegister = true
+	}
+	service.Success(c, res)
+	return
+}
 func UserLogout(c *gin.Context) {
 	req := account.DecryptJwtRequest{}
 	req.Token = c.GetHeader(e.Authorization)
@@ -459,6 +484,16 @@ func UserRegister(c *gin.Context) {
 		return
 	}
 	req.Domain = "app"
+	if req.InviterCode != "" {
+		codeRes, err := service.AccountFieeProvider.GetInviterInfo(context.Background(), &account.InviterInfoRequest{
+			Code: req.InviterCode,
+		})
+		if err != nil || codeRes.Id == 0 {
+			service.Error(c, errors.New("邀请码错误"))
+			return
+		}
+		req.InviterID = codeRes.Id
+	}
 	res, err := service.AccountFieeProvider.Register(context.Background(), &req)
 	if err != nil {
 		service.Error(c, err)

pkg/service/bundle/bundleOrder.go

@@ -246,7 +246,9 @@ func CreateBundleOrderSignature(c *gin.Context) {
 		service.Error(c, err)
 		return
 	}
-
+	if userInfo.InviterID != 0 && logic.CheckUserFirstOrder(userInfo.ID) {
+		req.InviterId = userInfo.InviterID
+	}
 	// 组装订单信息
 	req = logic.BuildOrderRequest(req, userInfo, bundleDetail, addRecords, addTotalPrice, lastContractNo, signContract)
 
@@ -518,7 +520,6 @@ func OrderRecordsListV2(c *gin.Context) {
 		for id := range userIdSet {
 			userIds = append(userIds, id)
 		}
-
 		userListResp, err := service.AccountFieeProvider.UserList(context.Background(), &accountFiee.UserListRequest{
 			Ids:    userIds,
 			Domain: "app",
@@ -540,6 +541,10 @@ func OrderRecordsListV2(c *gin.Context) {
 				item.CustomerName = u.Name
 				item.TelNum = u.TelNum
 				item.SubNum = u.SubNum
+				if item.InviterId != 0 {
+					item.InviterCode = u.InviterCode
+					item.InviterName = u.InviterName
+				}
 			}
 		}
 	}
@@ -622,6 +627,10 @@ func OrderRecordsListDownload(c *gin.Context) {
 				item.CustomerName = u.Name
 				item.TelNum = u.TelNum
 				item.SubNum = u.SubNum
+				if item.InviterId != 0 {
+					item.InviterCode = u.InviterCode
+					item.InviterName = u.InviterName
+				}
 			}
 		}
 	}
@@ -646,7 +655,7 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err
 
 	headers := []string{
 		"套餐订单号", "套餐类型", "套餐付款状态", "艺人手机号", "用户编号", "艺人", "套餐订单创建时间", "套餐支付时间", "套餐金额",
-		"增值服务订单号", "增值税服务金额", "支付金额", "币种", "手续费", "增值订单创建时间", "增值付款状态",
+		"增值服务订单号", "增值税服务金额", "支付金额", "币种", "手续费", "增值订单创建时间", "增值付款状态", "邀请码", "邀请码所属人",
 	}
 	for i, h := range headers {
 		cell := fmt.Sprintf("%s%d", string(rune('A'+i)), 1)
@@ -680,6 +689,8 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err
 		f.SetCellValue(sheetName, fmt.Sprintf("G%d", rowIndex), bundleInfo.BundleCreateAt)
 		f.SetCellValue(sheetName, fmt.Sprintf("H%d", rowIndex), bundleInfo.PayTime)
 		f.SetCellValue(sheetName, fmt.Sprintf("I%d", rowIndex), bundleInfo.Amount)
+		f.SetCellValue(sheetName, fmt.Sprintf("Q%d", rowIndex), bundleInfo.InviterCode)
+		f.SetCellValue(sheetName, fmt.Sprintf("R%d", rowIndex), bundleInfo.InviterName)
 
 		if addCount > 0 {
 			for i, add := range bundleInfo.AddBundleInfo {

pkg/service/bundle/logic/bundleOrder.go

@@ -63,6 +63,24 @@ func CheckUserOrder(userID uint64) error {
 	return nil
 }
 
+// 校验用户是否首次购买
+func CheckUserFirstOrder(userID uint64) bool {
+	req := bundle.OrderRecordsDetailRequest{
+		CustomerID: strconv.FormatUint(userID, 10),
+		Status:     2,
+	}
+	records, _ := service.BundleProvider.OrderRecordsDetail(context.Background(), &req)
+	// 用户没有任何订单记录
+	if records.OrderRecord == nil {
+		return true
+	}
+	// 检查订单是否属于该用户
+	if records.OrderRecord.CustomerID != strconv.FormatUint(userID, 10) {
+		return true
+	}
+	return false
+}
+
 // 获取最后一次合同编号
 func GetLastContractNo() (string, error) {
 	records, err := service.BundleProvider.OrderRecordsList(context.Background(), &bundle.OrderRecordsRequest{