修改

api/accountFiee/accountFiee.proto

@@ -62,6 +62,9 @@ service AccountFiee {
   rpc VerifySliderCaptcha(VerifySliderCaptchaRequest) returns (VerifySliderCaptchaResponse) {}// 验证滑块验证码位置
   rpc SendNationMsg (SendNationMsgRequest) returns (SendMsgStatusResponse) {} //发送境外国际短信验证码 --艺术商城
   rpc VerifySliderStatus(VerifySliderStatusRequest) returns (VerifySliderStatusResponse) {}// 验证滑块验证码状态
+
+  // submit info
+  rpc SaveSubmitInfo(SubmitInfoRequest) returns (CommonResponse);
 }
 
 message VerifySliderStatusRequest {
@@ -153,6 +156,8 @@ message UserListRequest{
   int32 auditStatus = 7;
   uint64 page = 8;
   uint64 pageSize = 9;
+  string blurNameTel = 10;
+  repeated int64 ids = 11;
 }
 message UserInfoResponse{
   uint64 id = 1;
@@ -817,4 +822,11 @@ message ClockLogReq{
 message ClockLogListResponse{
   repeated ClockLogInfo data =1;
   uint64 count = 2;
+}
+message SubmitInfoRequest{
+  string firstName = 1;
+  string lastName = 2;
+  string email = 3;
+  string company = 4;
+  string phone = 5;
 }

api/accountFiee/accountFiee.validator.pb.go

@@ -522,3 +522,6 @@ func (this *ClockLogListResponse) Validate() error {
 	}
 	return nil
 }
+func (this *SubmitInfoRequest) Validate() error {
+	return nil
+}

api/accountFiee/accountFiee_triple.pb.go

@@ -68,6 +68,8 @@ type AccountFieeClient interface {
 	VerifySliderCaptcha(ctx context.Context, in *VerifySliderCaptchaRequest, opts ...grpc_go.CallOption) (*VerifySliderCaptchaResponse, common.ErrorWithAttachment)
 	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)
+	// submit info
+	SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 }
 
 type accountFieeClient struct {
@@ -114,6 +116,7 @@ type AccountFieeClientImpl struct {
 	VerifySliderCaptcha           func(ctx context.Context, in *VerifySliderCaptchaRequest) (*VerifySliderCaptchaResponse, error)
 	SendNationMsg                 func(ctx context.Context, in *SendNationMsgRequest) (*SendMsgStatusResponse, error)
 	VerifySliderStatus            func(ctx context.Context, in *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
+	SaveSubmitInfo                func(ctx context.Context, in *SubmitInfoRequest) (*CommonResponse, error)
 }
 
 func (c *AccountFieeClientImpl) GetDubboStub(cc *triple.TripleConn) AccountFieeClient {
@@ -362,6 +365,12 @@ func (c *accountFieeClient) VerifySliderStatus(ctx context.Context, in *VerifySl
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/VerifySliderStatus", in, out)
 }
 
+func (c *accountFieeClient) SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) {
+	out := new(CommonResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SaveSubmitInfo", in, out)
+}
+
 // AccountFieeServer is the server API for AccountFiee service.
 // All implementations must embed UnimplementedAccountFieeServer
 // for forward compatibility
@@ -406,6 +415,8 @@ type AccountFieeServer interface {
 	VerifySliderCaptcha(context.Context, *VerifySliderCaptchaRequest) (*VerifySliderCaptchaResponse, error)
 	SendNationMsg(context.Context, *SendNationMsgRequest) (*SendMsgStatusResponse, error)
 	VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
+	// submit info
+	SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error)
 	mustEmbedUnimplementedAccountFieeServer()
 }
 
@@ -531,6 +542,9 @@ func (UnimplementedAccountFieeServer) SendNationMsg(context.Context, *SendNation
 func (UnimplementedAccountFieeServer) VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method VerifySliderStatus not implemented")
 }
+func (UnimplementedAccountFieeServer) SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SaveSubmitInfo not implemented")
+}
 func (s *UnimplementedAccountFieeServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -1690,6 +1704,35 @@ func _AccountFiee_VerifySliderStatus_Handler(srv interface{}, ctx context.Contex
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AccountFiee_SaveSubmitInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SubmitInfoRequest)
+	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("SaveSubmitInfo", 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)
+}
+
 // AccountFiee_ServiceDesc is the grpc_go.ServiceDesc for AccountFiee service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1853,6 +1896,10 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "VerifySliderStatus",
 			Handler:    _AccountFiee_VerifySliderStatus_Handler,
 		},
+		{
+			MethodName: "SaveSubmitInfo",
+			Handler:    _AccountFiee_SaveSubmitInfo_Handler,
+		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
 	Metadata: "api/accountFiee/accountFiee.proto",

api/bundle/bundle.validator.pb.go

@@ -17,6 +17,32 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+func (this *OrderRecordsRequestV2) Validate() error {
+	return nil
+}
+func (this *OrderRecordsResponseV2) Validate() error {
+	for _, item := range this.BundleInfo {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("BundleInfo", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *OrderBundleRecordInfo) Validate() error {
+	for _, item := range this.AddBundleInfo {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("AddBundleInfo", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *OrderAddBundleRecordInfo) Validate() error {
+	return nil
+}
 func (this *PackagePriceAndTimeResponse) Validate() error {
 	return nil
 }

api/bundle/bundle_triple.pb.go

@@ -45,6 +45,7 @@ type BundleClient interface {
 	UpdateFinancialConfirmationStatus(ctx context.Context, in *FinancialConfirmationRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	CreateOrderAddRecord(ctx context.Context, in *OrderAddRecord, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	PackagePriceAndTime(ctx context.Context, in *OrderRecord, opts ...grpc_go.CallOption) (*PackagePriceAndTimeResponse, common.ErrorWithAttachment)
+	OrderRecordsListV2(ctx context.Context, in *OrderRecordsRequestV2, opts ...grpc_go.CallOption) (*OrderRecordsResponseV2, common.ErrorWithAttachment)
 	//增值套餐
 	CreateValueAddBundle(ctx context.Context, in *CreateValueAddBundleRequest, opts ...grpc_go.CallOption) (*CreateValueAddBundleResponse, common.ErrorWithAttachment)
 	ValueAddBundleList(ctx context.Context, in *ValueAddBundleListRequest, opts ...grpc_go.CallOption) (*ValueAddBundleListResponse, common.ErrorWithAttachment)
@@ -77,6 +78,7 @@ type BundleClientImpl struct {
 	UpdateFinancialConfirmationStatus func(ctx context.Context, in *FinancialConfirmationRequest) (*CommonResponse, error)
 	CreateOrderAddRecord              func(ctx context.Context, in *OrderAddRecord) (*CommonResponse, error)
 	PackagePriceAndTime               func(ctx context.Context, in *OrderRecord) (*PackagePriceAndTimeResponse, error)
+	OrderRecordsListV2                func(ctx context.Context, in *OrderRecordsRequestV2) (*OrderRecordsResponseV2, error)
 	CreateValueAddBundle              func(ctx context.Context, in *CreateValueAddBundleRequest) (*CreateValueAddBundleResponse, error)
 	ValueAddBundleList                func(ctx context.Context, in *ValueAddBundleListRequest) (*ValueAddBundleListResponse, error)
 	ValueAddBundleDetail              func(ctx context.Context, in *ValueAddBundleDetailRequest) (*ValueAddBundleDetailResponse, error)
@@ -199,6 +201,12 @@ func (c *bundleClient) PackagePriceAndTime(ctx context.Context, in *OrderRecord,
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/PackagePriceAndTime", in, out)
 }
 
+func (c *bundleClient) OrderRecordsListV2(ctx context.Context, in *OrderRecordsRequestV2, opts ...grpc_go.CallOption) (*OrderRecordsResponseV2, common.ErrorWithAttachment) {
+	out := new(OrderRecordsResponseV2)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/OrderRecordsListV2", in, out)
+}
+
 func (c *bundleClient) CreateValueAddBundle(ctx context.Context, in *CreateValueAddBundleRequest, opts ...grpc_go.CallOption) (*CreateValueAddBundleResponse, common.ErrorWithAttachment) {
 	out := new(CreateValueAddBundleResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -256,6 +264,7 @@ type BundleServer interface {
 	UpdateFinancialConfirmationStatus(context.Context, *FinancialConfirmationRequest) (*CommonResponse, error)
 	CreateOrderAddRecord(context.Context, *OrderAddRecord) (*CommonResponse, error)
 	PackagePriceAndTime(context.Context, *OrderRecord) (*PackagePriceAndTimeResponse, error)
+	OrderRecordsListV2(context.Context, *OrderRecordsRequestV2) (*OrderRecordsResponseV2, error)
 	//增值套餐
 	CreateValueAddBundle(context.Context, *CreateValueAddBundleRequest) (*CreateValueAddBundleResponse, error)
 	ValueAddBundleList(context.Context, *ValueAddBundleListRequest) (*ValueAddBundleListResponse, error)
@@ -323,6 +332,9 @@ func (UnimplementedBundleServer) CreateOrderAddRecord(context.Context, *OrderAdd
 func (UnimplementedBundleServer) PackagePriceAndTime(context.Context, *OrderRecord) (*PackagePriceAndTimeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PackagePriceAndTime not implemented")
 }
+func (UnimplementedBundleServer) OrderRecordsListV2(context.Context, *OrderRecordsRequestV2) (*OrderRecordsResponseV2, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method OrderRecordsListV2 not implemented")
+}
 func (UnimplementedBundleServer) CreateValueAddBundle(context.Context, *CreateValueAddBundleRequest) (*CreateValueAddBundleResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateValueAddBundle not implemented")
 }
@@ -862,6 +874,35 @@ func _Bundle_PackagePriceAndTime_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_OrderRecordsListV2_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(OrderRecordsRequestV2)
+	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("OrderRecordsListV2", 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 _Bundle_CreateValueAddBundle_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateValueAddBundleRequest)
 	if err := dec(in); err != nil {
@@ -1111,6 +1152,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "PackagePriceAndTime",
 			Handler:    _Bundle_PackagePriceAndTime_Handler,
 		},
+		{
+			MethodName: "OrderRecordsListV2",
+			Handler:    _Bundle_OrderRecordsListV2_Handler,
+		},
 		{
 			MethodName: "CreateValueAddBundle",
 			Handler:    _Bundle_CreateValueAddBundle_Handler,

pkg/router/bundleOrder.go

@@ -23,6 +23,7 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 		bundleOrderClientWebRoute := bundleOrderRoute.Group("common/web")
 		{
 			bundleOrderClientWebRoute.POST("bundle-order-list", bundle.OrderRecordsList)
+			bundleOrderClientWebRoute.POST("bundle-order-list-V2", bundle.OrderRecordsListV2)
 		}
 		bundleOrderClientAppRoute := bundleOrderRoute.Group("common/app")
 		{

pkg/service/bundle/bundleOrder.go

@@ -420,7 +420,87 @@ func UpdateBundleOrderStatusPaid(c *gin.Context) {
 
 	service.Success(c, nil)
 }
+func OrderRecordsListV2(c *gin.Context) {
+	var req bundle.OrderRecordsRequestV2
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
 
+	res := &bundle.OrderRecordsResponseV2{}
+
+	// Step 1: 如果有姓名/电话筛选，先查用户列表
+	if req.CustomerName != "" {
+		userListResp, err := service.AccountFieeProvider.UserList(context.Background(), &accountFiee.UserListRequest{
+			BlurNameTel: req.CustomerName,
+			Domain:      "app",
+		})
+		if err != nil {
+			service.Error(c, err)
+			return
+		}
+
+		if len(userListResp.UserList) == 0 {
+			// 没查到用户，直接返回空结果
+			res.Page = req.Page
+			res.PageSize = req.PageSize
+			res.Total = 0
+			service.Success(c, res)
+			return
+		}
+
+		// 提取用户ID列表
+		for _, u := range userListResp.UserList {
+			req.UserIds = append(req.UserIds, int64(u.Id))
+		}
+	}
+
+	// Step 2: 查询订单列表
+	orderList, err := service.BundleProvider.OrderRecordsListV2(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	// Step 3: 如果订单不为空，查一次用户信息填充（只查一次）
+	if len(orderList.BundleInfo) > 0 {
+		// 收集订单里的所有用户ID
+		userIdSet := make(map[int64]struct{})
+		for _, i := range orderList.BundleInfo {
+			userIdSet[i.CustomerId] = struct{}{}
+		}
+
+		var userIds []int64
+		for id := range userIdSet {
+			userIds = append(userIds, id)
+		}
+
+		userListResp, err := service.AccountFieeProvider.UserList(context.Background(), &accountFiee.UserListRequest{
+			Ids:    userIds,
+			Domain: "app",
+		})
+		if err != nil {
+			service.Error(c, err)
+			return
+		}
+
+		// 建立用户ID -> 用户信息映射
+		userMap := make(map[int64]*accountFiee.UserListInfo, len(userListResp.UserList))
+		for _, u := range userListResp.UserList {
+			userMap[int64(u.Id)] = u
+		}
+
+		// 填充订单中的用户信息
+		for _, item := range orderList.BundleInfo {
+			if u, ok := userMap[item.CustomerId]; ok {
+				item.CustomerName = u.Name
+				item.TelNum = u.TelNum
+			}
+		}
+	}
+
+	service.Success(c, orderList)
+}
 func OrderRecordsList(c *gin.Context) {
 	var req bundle.OrderRecordsRequest