fix: 修复组织充值报告中订单用户名显示错误问题 (#967)

Co-authored-by: Dev Agent <dev-agent@example.com>
Co-authored-by: rader <ld_leida@hotmail.com>

Author: 3 people

_mocks/opencsg.com/csghub-server/builder/store/database/mock_NamespaceStore.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/uptrace/bun"
 	"opencsg.com/csghub-server/common/errorx"
 )
 
@@ -13,6 +14,7 @@ type NamespaceStore interface {
 	FindByUUID(ctx context.Context, uuid string) (Namespace, error)
 	Exists(ctx context.Context, path string) (bool, error)
 	ExistsByUUID(ctx context.Context, uuid string) (bool, error)
+	FindByUUIDs(ctx context.Context, uuids []string) ([]Namespace, error)
 }
 
 type NamespaceStoreImpl struct {
@@ -49,6 +51,7 @@ type Namespace struct {
 func (s *NamespaceStoreImpl) FindByPath(ctx context.Context, path string) (namespace Namespace, err error) {
 	namespace.Path = path
 	err = s.db.Operator.Core.NewSelect().Model(&namespace).Relation("User").Where("path = ?", path).Scan(ctx)
+	err = errorx.HandleDBError(err, errorx.Ctx().Set("namespace", path))
 	return
 }
 
@@ -81,3 +84,20 @@ func (s *NamespaceStoreImpl) FindByUUID(ctx context.Context, uuid string) (names
 	}
 	return namespace, nil
 }
+
+func (s *NamespaceStoreImpl) FindByUUIDs(ctx context.Context, uuids []string) (namespaces []Namespace, err error) {
+	if len(uuids) == 0 {
+		return namespaces, nil
+	}
+
+	err = s.db.Operator.Core.
+		NewSelect().
+		Model(&namespaces).
+		Where("uuid IN (?)", bun.In(uuids)).
+		Scan(ctx)
+	if err != nil {
+		return namespaces, errorx.HandleDBError(err, errorx.Ctx().Set("uuids", uuids))
+	}
+
+	return namespaces, nil
+}

builder/store/database/namespace.go

@@ -449,6 +449,8 @@ type RechargeResp struct {
 	UpdatedAt      time.Time `json:"updated_at"`
 	Description    string    `json:"description"`
 	UserName       string    `json:"user_name"`
+	EntityType     string    `json:"entity_type"`
+	OrgName        string    `json:"org_name"`
 }
 
 const RechargeExtraType = "recharge"
@@ -531,18 +533,18 @@ type RechargesIndexResp struct {
 }
 
 type PresentIndexResp struct {
-	ID            int64     `json:"id"`
-	EventUUID     string    `json:"event_uuid"`
-	UserUUID      string    `json:"user_uuid"`
-	UserName      string    `json:"user_name"`
-	ActivityID    int64     `json:"activity_id"`
-	Value         float64   `json:"value"`
-	OpUID         string    `json:"op_uid"`
-	OpDesc        string    `json:"op_desc"`
-	ParticipantUUID string   `json:"participant_uuid"`
-	ExpireAt      time.Time `json:"expire_at"`
-	Status        AccountPresentStatus `json:"status"`
-	CreatedAt     time.Time `json:"created_at"`
+	ID              int64                `json:"id"`
+	EventUUID       string               `json:"event_uuid"`
+	UserUUID        string               `json:"user_uuid"`
+	UserName        string               `json:"user_name"`
+	ActivityID      int64                `json:"activity_id"`
+	Value           float64              `json:"value"`
+	OpUID           string               `json:"op_uid"`
+	OpDesc          string               `json:"op_desc"`
+	ParticipantUUID string               `json:"participant_uuid"`
+	ExpireAt        time.Time            `json:"expire_at"`
+	Status          AccountPresentStatus `json:"status"`
+	CreatedAt       time.Time            `json:"created_at"`
 }
 
 type PresentsIndexResp struct {

common/types/accounting.go

@@ -17,6 +17,7 @@ type accountingComponentImpl struct {
 	accountingClient      accounting.AccountingClient
 	userStore             database.UserStore
 	orgStore              database.OrgStore
+	namespaceStore        database.NamespaceStore
 	memberStore           database.MemberStore
 	deployTaskStore       database.DeployTaskStore
 	userSvcClient         rpc.UserSvcClient
@@ -65,7 +66,8 @@ func NewAccountingComponent(config *config.Config) (AccountingComponent, error)
 		userSvcClient:    userRpcClient,
 		notificationSvcClient: rpc.NewNotificationSvcHttpClient(fmt.Sprintf("%s:%d", config.Notification.Host, config.Notification.Port),
 			rpc.AuthWithApiKey(config.APIToken)),
-		config: config,
+		config:         config,
+		namespaceStore: database.NewNamespaceStore(),
 	}, nil
 }