@r2wa-org/eden 0.0.48 → 0.0.51

package/dist/src/transfer/errors/index.d.ts

@@ -1,28 +1,28 @@
 export * from "./locales/zh";
 /** Transfer 模块错误码 */
 export declare const TransferErrorCodes: {
-    /** 目标用户名不能为空 */
-    readonly TRANSFER_TARGET_USERNAME_REQUIRED: "TRANSFER_TARGET_USERNAME_REQUIRED";
-    /** 钱包类型编码不能为空 */
-    readonly TRANSFER_WALLET_TYPE_CODE_REQUIRED: "TRANSFER_WALLET_TYPE_CODE_REQUIRED";
     /** 转账金额无效 */
     readonly TRANSFER_INVALID_AMOUNT: "TRANSFER_INVALID_AMOUNT";
-    /** 目标用户不存在 */
-    readonly TRANSFER_TARGET_USER_NOT_FOUND: "TRANSFER_TARGET_USER_NOT_FOUND";
     /** 不允许转给自己 */
     readonly TRANSFER_CANNOT_TRANSFER_TO_SELF: "TRANSFER_CANNOT_TRANSFER_TO_SELF";
-    /** 钱包类型不存在 */
-    readonly TRANSFER_WALLET_TYPE_NOT_FOUND: "TRANSFER_WALLET_TYPE_NOT_FOUND";
-    /** 钱包类型未启用 */
-    readonly TRANSFER_WALLET_TYPE_DISABLED: "TRANSFER_WALLET_TYPE_DISABLED";
-    /** 来源钱包不允许转账 */
-    readonly TRANSFER_SOURCE_WALLET_NOT_ALLOWED: "TRANSFER_SOURCE_WALLET_NOT_ALLOWED";
-    /** 目标钱包不允许接收转账 */
-    readonly TRANSFER_TARGET_WALLET_NOT_ALLOWED: "TRANSFER_TARGET_WALLET_NOT_ALLOWED";
-    /** 转账金额超出范围 */
-    readonly TRANSFER_AMOUNT_OUT_OF_RANGE: "TRANSFER_AMOUNT_OUT_OF_RANGE";
     /** 创建转账订单失败 */
     readonly TRANSFER_CREATE_ORDER_FAILED: "TRANSFER_CREATE_ORDER_FAILED";
+    /** 来源账户不存在 */
+    readonly TRANSFER_SOURCE_ACCOUNT_NOT_FOUND: "TRANSFER_SOURCE_ACCOUNT_NOT_FOUND";
+    /** 目标账户不存在 */
+    readonly TRANSFER_TARGET_ACCOUNT_NOT_FOUND: "TRANSFER_TARGET_ACCOUNT_NOT_FOUND";
+    /** 账户不允许转账 */
+    readonly TRANSFER_ACCOUNT_NOT_ALLOWED: "TRANSFER_ACCOUNT_NOT_ALLOWED";
+    /** 转账金额低于最小限额 */
+    readonly TRANSFER_AMOUNT_TOO_SMALL: "TRANSFER_AMOUNT_TOO_SMALL";
+    /** 转账金额超过最大限额 */
+    readonly TRANSFER_AMOUNT_TOO_LARGE: "TRANSFER_AMOUNT_TOO_LARGE";
+    /** 账户资产不一致 */
+    readonly TRANSFER_ACCOUNT_ASSET_MISMATCH: "TRANSFER_ACCOUNT_ASSET_MISMATCH";
+    /** 不能转给同一账户 */
+    readonly TRANSFER_SAME_ACCOUNT_NOT_ALLOWED: "TRANSFER_SAME_ACCOUNT_NOT_ALLOWED";
+    /** 幂等键冲突 */
+    readonly TRANSFER_IDEMPOTENCY_CONFLICT: "TRANSFER_IDEMPOTENCY_CONFLICT";
 };
 type TransferErrorCodesType = typeof TransferErrorCodes;
 export type TransferErrorCode = keyof TransferErrorCodesType;

package/dist/src/transfer/errors/locales/zh.d.ts

@@ -1,15 +1,15 @@
 export declare const zh: {
-    TRANSFER_TARGET_USERNAME_REQUIRED: string;
-    TRANSFER_WALLET_TYPE_CODE_REQUIRED: string;
     TRANSFER_INVALID_AMOUNT: string;
-    TRANSFER_TARGET_USER_NOT_FOUND: string;
     TRANSFER_CANNOT_TRANSFER_TO_SELF: string;
-    TRANSFER_WALLET_TYPE_NOT_FOUND: string;
-    TRANSFER_WALLET_TYPE_DISABLED: string;
-    TRANSFER_SOURCE_WALLET_NOT_ALLOWED: string;
-    TRANSFER_TARGET_WALLET_NOT_ALLOWED: string;
-    TRANSFER_AMOUNT_OUT_OF_RANGE: string;
     TRANSFER_CREATE_ORDER_FAILED: string;
+    TRANSFER_SOURCE_ACCOUNT_NOT_FOUND: string;
+    TRANSFER_TARGET_ACCOUNT_NOT_FOUND: string;
+    TRANSFER_ACCOUNT_NOT_ALLOWED: string;
+    TRANSFER_AMOUNT_TOO_SMALL: string;
+    TRANSFER_AMOUNT_TOO_LARGE: string;
+    TRANSFER_ACCOUNT_ASSET_MISMATCH: string;
+    TRANSFER_SAME_ACCOUNT_NOT_ALLOWED: string;
+    TRANSFER_IDEMPOTENCY_CONFLICT: string;
 };
 type ZHType = typeof zh;
 declare module "../../../error/messages" {

package/dist/src/transfer/index.d.ts

@@ -1,8 +1,11 @@
-export * from "./admin.router";
+export { transferAdminListQuerySchema, transferOrderListResponseSchema } from "./admin/dto.schemas";
+export type { TransferAdminListQueryType, TransferOrderListResponseType } from "./admin/dto.schemas";
+export * from "./admin/service";
 export * from "./db.schemas";
-export * from "./dto.schemas";
 export * from "./errors";
+export * from "./internal/service";
 export * from "./permissions";
-export * from "./router";
 export * from "./schema";
-export * from "./service";
+export * from "./user/dto.schemas";
+export * from "./user/router";
+export * from "./user/service";

package/dist/src/transfer/internal/service.d.ts

@@ -0,0 +1,8 @@
+import Decimal from "decimal.js";
+export declare abstract class BaseTransferService {
+    protected static validateUserId(userId: string): void;
+    protected static validateAmount(amount: string): Decimal;
+    protected static validateTransferAmountRange(amount: Decimal, minAmount: string, maxAmount: string): void;
+}
+export declare abstract class InternalTransferService extends BaseTransferService {
+}

package/dist/src/transfer/router.d.ts

@@ -397,100 +397,14 @@ export declare const transferRouter: Elysia<"/transfer", {
                         id: string;
                         createdAt: Date;
                         updatedAt: Date;
+                        assetId: string | null;
                         amount: string;
+                        idempotencyKey: string;
                         orderNo: string;
+                        targetAccountId: string | null;
+                        sourceAccountId: string | null;
                         sourceUserId: string;
                         targetUserId: string;
-                        sourceWalletTypeId: string;
-                        targetWalletTypeId: string;
-                        sourceUser: {
-                            email: string;
-                            id: string;
-                            name: string;
-                            emailVerified: boolean;
-                            image: string | null;
-                            createdAt: Date;
-                            updatedAt: Date;
-                            twoFactorEnabled: boolean | null;
-                            username: string | null;
-                            displayUsername: string | null;
-                            isAnonymous: boolean | null;
-                            phoneNumber: string | null;
-                            phoneNumberVerified: boolean | null;
-                            role: string | null;
-                            banned: boolean | null;
-                            banReason: string | null;
-                            banExpires: Date | null;
-                        };
-                        targetUser: {
-                            email: string;
-                            id: string;
-                            name: string;
-                            emailVerified: boolean;
-                            image: string | null;
-                            createdAt: Date;
-                            updatedAt: Date;
-                            twoFactorEnabled: boolean | null;
-                            username: string | null;
-                            displayUsername: string | null;
-                            isAnonymous: boolean | null;
-                            phoneNumber: string | null;
-                            phoneNumberVerified: boolean | null;
-                            role: string | null;
-                            banned: boolean | null;
-                            banReason: string | null;
-                            banExpires: Date | null;
-                        };
-                        sourceWalletType: {
-                            id: string;
-                            name: string;
-                            createdAt: Date;
-                            updatedAt: Date;
-                            description: string | null;
-                            code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                            allowDeposit: boolean;
-                            allowWithdraw: boolean;
-                            minWithdrawAmount: string;
-                            maxWithdrawAmount: string;
-                            allowTransfer: boolean;
-                            minTransferAmount: string;
-                            maxTransferAmount: string;
-                            allowExchange: boolean;
-                            allowReceiveExchange: boolean;
-                            minExchangeAmount: string;
-                            maxExchangeAmount: string;
-                            exchangeRate: string;
-                            allowTransaction: boolean;
-                            hasExpiry: boolean;
-                            expiryDays: number | null;
-                            isActive: boolean;
-                            sortOrder: number;
-                        };
-                        targetWalletType: {
-                            id: string;
-                            name: string;
-                            createdAt: Date;
-                            updatedAt: Date;
-                            description: string | null;
-                            code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                            allowDeposit: boolean;
-                            allowWithdraw: boolean;
-                            minWithdrawAmount: string;
-                            maxWithdrawAmount: string;
-                            allowTransfer: boolean;
-                            minTransferAmount: string;
-                            maxTransferAmount: string;
-                            allowExchange: boolean;
-                            allowReceiveExchange: boolean;
-                            minExchangeAmount: string;
-                            maxExchangeAmount: string;
-                            exchangeRate: string;
-                            allowTransaction: boolean;
-                            hasExpiry: boolean;
-                            expiryDays: number | null;
-                            isActive: boolean;
-                            sortOrder: number;
-                        };
                     }[];
                     pagination: {
                         total: number;
@@ -515,38 +429,41 @@ export declare const transferRouter: Elysia<"/transfer", {
     };
 } & {
     transfer: {
-        post: {
-            body: {
-                amount: string;
-                walletTypeCode: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                targetUsername: string;
-                transactionPassword: string;
-            };
-            params: {};
-            query: unknown;
-            headers: unknown;
-            response: {
-                200: {
-                    id: string;
+        ledger_account: {
+            post: {
+                body: {
                     amount: string;
-                    orderNo: string;
-                    sourceUserId: string;
-                    targetUserId: string;
-                    sourceWalletTypeId: string;
-                    targetWalletTypeId: string;
-                    outLedgerEntryId: string;
-                    inLedgerEntryId: string;
+                    idempotencyKey: string;
+                    targetAccountId: string;
+                    sourceAccountId: string;
+                    transactionPassword: string;
                 };
-                422: {
-                    type: "validation";
-                    on: string;
-                    summary?: string;
-                    message?: string;
-                    found?: unknown;
-                    property?: string;
-                    expected?: string;
+                params: {};
+                query: unknown;
+                headers: unknown;
+                response: {
+                    200: {
+                        id: string;
+                        assetId: string | null;
+                        amount: string;
+                        ledgerEntryId: string;
+                        orderNo: string;
+                        targetAccountId: string | null;
+                        sourceAccountId: string | null;
+                        sourceUserId: string;
+                        targetUserId: string;
+                    };
+                    422: {
+                        type: "validation";
+                        on: string;
+                        summary?: string;
+                        message?: string;
+                        found?: unknown;
+                        property?: string;
+                        expected?: string;
+                    };
+                    401: "Unauthorized";
                 };
-                401: "Unauthorized";
             };
         };
     };

package/dist/src/transfer/schema.d.ts

@@ -73,6 +73,23 @@ export declare const transferOrder: import("drizzle-orm/pg-core").PgTableWithCol
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        idempotencyKey: import("drizzle-orm/pg-core").PgColumn<{
+            name: "idempotency_key";
+            tableName: "transfer_order";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         sourceUserId: import("drizzle-orm/pg-core").PgColumn<{
             name: "source_user_id";
             tableName: "transfer_order";
@@ -107,14 +124,14 @@ export declare const transferOrder: import("drizzle-orm/pg-core").PgTableWithCol
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        sourceWalletTypeId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "source_wallet_type_id";
+        sourceAccountId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "source_account_id";
             tableName: "transfer_order";
             dataType: "string";
             columnType: "PgUUID";
             data: string;
             driverParam: string;
-            notNull: true;
+            notNull: false;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
@@ -124,14 +141,31 @@ export declare const transferOrder: import("drizzle-orm/pg-core").PgTableWithCol
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        targetWalletTypeId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "target_wallet_type_id";
+        targetAccountId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "target_account_id";
             tableName: "transfer_order";
             dataType: "string";
             columnType: "PgUUID";
             data: string;
             driverParam: string;
-            notNull: true;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        assetId: import("drizzle-orm/pg-core").PgColumn<{
+            name: "asset_id";
+            tableName: "transfer_order";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: false;
             hasDefault: false;
             isPrimaryKey: false;
             isAutoincrement: false;
@@ -164,6 +198,7 @@ export declare const transferOrder: import("drizzle-orm/pg-core").PgTableWithCol
 export declare const transferOrderRelations: import("drizzle-orm").Relations<"transfer_order", {
     sourceUser: import("drizzle-orm").One<"user", true>;
     targetUser: import("drizzle-orm").One<"user", true>;
-    sourceWalletType: import("drizzle-orm").One<"wallet_type", true>;
-    targetWalletType: import("drizzle-orm").One<"wallet_type", true>;
+    sourceAccount: import("drizzle-orm").One<"ledger_account", false>;
+    targetAccount: import("drizzle-orm").One<"ledger_account", false>;
+    asset: import("drizzle-orm").One<"asset", false>;
 }>;

package/dist/src/transfer/service.d.ts

@@ -1,36 +1,35 @@
 import Decimal from "decimal.js";
-import type { WalletTypeSelectSchemaType } from "../wallet-type/db.schemas";
-import type { TransferAdminListQueryType, TransferCreateInputType, TransferUserListQueryType } from "./dto.schemas";
+import type { LedgerAccountTransferCreateInputType, TransferAdminListQueryType, TransferUserListQueryType } from "./dto.schemas";
 declare abstract class BaseTransferService {
     protected static validateUserId(userId: string): void;
-    protected static validateTargetUsername(username: string): void;
-    protected static validateWalletTypeCode(code: string): void;
     protected static validateAmount(amount: string): Decimal;
-    protected static validateAmountRange(amount: Decimal, walletTypeConfig: Pick<WalletTypeSelectSchemaType, "minTransferAmount" | "maxTransferAmount">): void;
+    protected static validateTransferAmountRange(amount: Decimal, minAmount: string, maxAmount: string): void;
 }
 export declare abstract class UserTransferService extends BaseTransferService {
-    static createTransfer(userId: string, input: TransferCreateInputType): Promise<{
+    static createLedgerAccountTransfer(userId: string, input: LedgerAccountTransferCreateInputType): Promise<{
         id: string;
         orderNo: string;
         sourceUserId: string;
         targetUserId: string;
-        sourceWalletTypeId: string;
-        targetWalletTypeId: string;
+        sourceAccountId: string | null;
+        targetAccountId: string | null;
+        assetId: string | null;
         amount: string;
-        outLedgerEntryId: string;
-        inLedgerEntryId: string;
+        ledgerEntryId: string;
     }>;
     static listMyTransfers(userId: string, filters?: TransferUserListQueryType): Promise<{
         items: {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            assetId: string | null;
             amount: string;
+            idempotencyKey: string;
             orderNo: string;
+            targetAccountId: string | null;
+            sourceAccountId: string | null;
             sourceUserId: string;
             targetUserId: string;
-            sourceWalletTypeId: string;
-            targetWalletTypeId: string;
             sourceUser: {
                 email: string;
                 id: string;
@@ -69,56 +68,6 @@ export declare abstract class UserTransferService extends BaseTransferService {
                 banReason: string | null;
                 banExpires: Date | null;
             };
-            sourceWalletType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowExchange: boolean;
-                allowReceiveExchange: boolean;
-                minExchangeAmount: string;
-                maxExchangeAmount: string;
-                exchangeRate: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                isActive: boolean;
-                sortOrder: number;
-            };
-            targetWalletType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowExchange: boolean;
-                allowReceiveExchange: boolean;
-                minExchangeAmount: string;
-                maxExchangeAmount: string;
-                exchangeRate: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                isActive: boolean;
-                sortOrder: number;
-            };
         }[];
         total: number;
     }>;
@@ -129,12 +78,14 @@ export declare abstract class AdminTransferService extends BaseTransferService {
             id: string;
             createdAt: Date;
             updatedAt: Date;
+            assetId: string | null;
             amount: string;
+            idempotencyKey: string;
             orderNo: string;
+            targetAccountId: string | null;
+            sourceAccountId: string | null;
             sourceUserId: string;
             targetUserId: string;
-            sourceWalletTypeId: string;
-            targetWalletTypeId: string;
             sourceUser: {
                 email: string;
                 id: string;
@@ -173,56 +124,6 @@ export declare abstract class AdminTransferService extends BaseTransferService {
                 banReason: string | null;
                 banExpires: Date | null;
             };
-            sourceWalletType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowExchange: boolean;
-                allowReceiveExchange: boolean;
-                minExchangeAmount: string;
-                maxExchangeAmount: string;
-                exchangeRate: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                isActive: boolean;
-                sortOrder: number;
-            };
-            targetWalletType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                code: "balance" | "profit" | "team" | "check_in" | "meeting_reward" | "reform_pioneer_allowance" | "reform_monthly_enjoy" | "basic_livelihood" | "basic_pension" | "basic_medical";
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowExchange: boolean;
-                allowReceiveExchange: boolean;
-                minExchangeAmount: string;
-                maxExchangeAmount: string;
-                exchangeRate: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                isActive: boolean;
-                sortOrder: number;
-            };
         }[];
         total: number;
     }>;