From c8834b6227ae1687fb42e6203084972b422721cd Mon Sep 17 00:00:00 2001 From: lxy Date: Thu, 27 Jun 2024 18:29:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9sysAccountOper=E4=B8=ADty?= =?UTF-8?q?pe,offlineAccount=E3=80=81wpAccount=E7=9A=84action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/sysAccountOper/list/index.ts | 2 +- src/configuration/attrUpdateMatrix.ts | 6 +++--- src/entities/OfflineAccount.ts | 17 ++++++++++++----- src/entities/SysAccountOper.ts | 5 ++--- src/entities/WpAccount.ts | 15 +++++++++++---- src/types/sysAccountOper.ts | 1 + 6 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 src/types/sysAccountOper.ts diff --git a/src/components/sysAccountOper/list/index.ts b/src/components/sysAccountOper/list/index.ts index 6a97788a..1c9fbe1c 100644 --- a/src/components/sysAccountOper/list/index.ts +++ b/src/components/sysAccountOper/list/index.ts @@ -1,4 +1,4 @@ -import { SysAccountOperType } from '@project/oak-app-domain/SysAccountOper/Schema'; +import { SysAccountOperType } from '@project/types/sysAccountOper'; import dayjs from 'dayjs'; import { ToYuan, ThousandCont } from "oak-domain/lib/utils/money"; diff --git a/src/configuration/attrUpdateMatrix.ts b/src/configuration/attrUpdateMatrix.ts index 5b54da57..a684c3e8 100644 --- a/src/configuration/attrUpdateMatrix.ts +++ b/src/configuration/attrUpdateMatrix.ts @@ -143,7 +143,7 @@ const attrUpdateMatrix: AttrUpdateMatrix = { actions: ['update'], }, price: { - actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'], + actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'], }, allowDeposit: { actions: ['update'], @@ -163,7 +163,7 @@ const attrUpdateMatrix: AttrUpdateMatrix = { enabled: true, }, }, - withdrawTransferLossRatio: { + withdrawTransferLossRatio: { actions: ['update'], filter: { enabled: true, @@ -205,7 +205,7 @@ const attrUpdateMatrix: AttrUpdateMatrix = { actions: ['update'], }, price: { - actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'], + actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'], } }, withdrawAccount: { diff --git a/src/entities/OfflineAccount.ts b/src/entities/OfflineAccount.ts index 32db315c..a4bb2de5 100644 --- a/src/entities/OfflineAccount.ts +++ b/src/entities/OfflineAccount.ts @@ -13,6 +13,7 @@ import { Schema as Pay } from './Pay'; import { Schema as SysAccountOper } from './SysAccountOper'; import { Schema as AbstractAccount } from './AbstractAccount'; import { Schema as WithdrawChannel } from './WithdrawChannel'; +import { SysAccountOperType as sysAction } from '../types/sysAccountOper'; export interface Schema extends AbstractAccount { type: 'bank' | 'alipay' | 'wechat' | 'shouqianba' | 'others', @@ -29,7 +30,7 @@ export interface Schema extends AbstractAccount { enabled: Boolean; }; -export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax'; +export type Action = sysAction | 'deposit' | 'tax'; export const entityDesc: EntityDesc = { locales: { @@ -53,8 +54,11 @@ export const entityDesc: EntityDesc = { action: { pay: '支付', refund: '退款', + withdrawTransfer: '提现转账', + compensate: '补偿', + moveIn: '转入', + moveOut: '转出', deposit: '充值', - withdraw: '提现', tax: '渠道费', } }, @@ -63,9 +67,12 @@ export const entityDesc: EntityDesc = { icon: { pay: '', refund: '', + withdrawTransfer: '', + compensate: '', + moveIn: '', + moveOut: '', deposit: '', - withdraw: '', - tax: '', + tax: '', } } }; diff --git a/src/types/sysAccountOper.ts b/src/types/sysAccountOper.ts new file mode 100644 index 00000000..2f06e1d0 --- /dev/null +++ b/src/types/sysAccountOper.ts @@ -0,0 +1 @@ +export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut'; \ No newline at end of file From 93c89f2b46aff1d0a3de2bdee3b9db22bd53574e Mon Sep 17 00:00:00 2001 From: lxy Date: Thu, 27 Jun 2024 18:29:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/sysAccount/survey/web.pc.module.less | 5 +++-- src/components/sysAccountOper/list/web.pc.tsx | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/sysAccount/survey/web.pc.module.less b/src/components/sysAccount/survey/web.pc.module.less index b7a8facb..e52e4727 100644 --- a/src/components/sysAccount/survey/web.pc.module.less +++ b/src/components/sysAccount/survey/web.pc.module.less @@ -19,13 +19,14 @@ padding: 8px; flex-wrap: wrap; margin-top: 12px; + gap: 14px; .sysAccount { width: 244px; height: 284px; border: solid 0.1px silver; border-radius: 5px; - margin-right: 14px; + // margin-right: 14px; display: flex; flex-direction: column; align-items: stretch; @@ -64,7 +65,7 @@ } } } - + .span2 { display: flex; flex-direction: row; diff --git a/src/components/sysAccountOper/list/web.pc.tsx b/src/components/sysAccountOper/list/web.pc.tsx index c11cc37e..0452cdac 100644 --- a/src/components/sysAccountOper/list/web.pc.tsx +++ b/src/components/sysAccountOper/list/web.pc.tsx @@ -5,7 +5,7 @@ import { RowWithActions, WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../oak-app-domain'; import Styles from './web.module.less'; import dayJs from 'dayjs'; -import { SysAccountOperType } from '@project/oak-app-domain/SysAccountOper/Schema'; +import { SysAccountOperType } from '@project/types/sysAccountOper'; type SAOType = SysAccountOperType | 'all'; @@ -31,7 +31,6 @@ export default function Render(props: WebComponentProps Date: Thu, 27 Jun 2024 18:30:13 +0800 Subject: [PATCH 3/3] build --- es/aspects/withdraw.d.ts | 24 +++++++++---------- es/components/sysAccount/survey/web.pc.js | 9 +++---- .../sysAccount/survey/web.pc.module.less | 5 ++-- es/components/sysAccountOper/list/web.pc.d.ts | 2 +- es/components/sysAccountOper/list/web.pc.js | 1 - es/configuration/attrUpdateMatrix.js | 4 ++-- es/entities/OfflineAccount.d.ts | 3 ++- es/entities/OfflineAccount.js | 10 ++++++-- es/entities/SysAccountOper.d.ts | 2 +- es/entities/SysAccountOper.js | 2 +- es/entities/WpAccount.d.ts | 3 ++- es/entities/WpAccount.js | 10 ++++++-- es/oak-app-domain/OfflineAccount/Action.d.ts | 3 ++- es/oak-app-domain/OfflineAccount/Action.js | 2 +- es/oak-app-domain/OfflineAccount/Style.js | 5 +++- .../OfflineAccount/locales/zh_CN.json | 2 +- es/oak-app-domain/SysAccountOper/Schema.d.ts | 2 +- es/oak-app-domain/WpAccount/Action.d.ts | 3 ++- es/oak-app-domain/WpAccount/Action.js | 2 +- es/oak-app-domain/WpAccount/Style.js | 5 +++- .../WpAccount/locales/zh_CN.json | 2 +- es/types/sysAccountOper.d.ts | 1 + es/types/sysAccountOper.js | 1 + lib/configuration/attrUpdateMatrix.js | 4 ++-- lib/entities/OfflineAccount.d.ts | 3 ++- lib/entities/OfflineAccount.js | 10 ++++++-- lib/entities/SysAccountOper.d.ts | 2 +- lib/entities/SysAccountOper.js | 2 +- lib/entities/WpAccount.d.ts | 3 ++- lib/entities/WpAccount.js | 10 ++++++-- lib/oak-app-domain/OfflineAccount/Action.d.ts | 3 ++- lib/oak-app-domain/OfflineAccount/Action.js | 2 +- lib/oak-app-domain/OfflineAccount/Style.js | 5 +++- .../OfflineAccount/locales/zh_CN.json | 2 +- lib/oak-app-domain/SysAccountOper/Schema.d.ts | 2 +- lib/oak-app-domain/WpAccount/Action.d.ts | 3 ++- lib/oak-app-domain/WpAccount/Action.js | 2 +- lib/oak-app-domain/WpAccount/Style.js | 5 +++- .../WpAccount/locales/zh_CN.json | 2 +- lib/types/sysAccountOper.d.ts | 1 + lib/types/sysAccountOper.js | 2 ++ 41 files changed, 108 insertions(+), 58 deletions(-) create mode 100644 es/types/sysAccountOper.d.ts create mode 100644 es/types/sysAccountOper.js create mode 100644 lib/types/sysAccountOper.d.ts create mode 100644 lib/types/sysAccountOper.js diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index 8ad7334d..5d27ce2e 100644 --- a/es/aspects/withdraw.d.ts +++ b/es/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -12,12 +12,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -26,12 +26,12 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -40,12 +40,12 @@ export declare function getWithdrawCreateData(params: { creatorId: string; creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: { creator?: undefined; creatorId: string; } & { - refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; - withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + refund$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; + withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit[]> | (import("oak-domain/lib/types").Operation, Omit> | import("oak-domain/lib/types").Operation<"create", Omit>)[] | undefined; modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; diff --git a/es/components/sysAccount/survey/web.pc.js b/es/components/sysAccount/survey/web.pc.js index a700296f..93377e61 100644 --- a/es/components/sysAccount/survey/web.pc.js +++ b/es/components/sysAccount/survey/web.pc.js @@ -105,9 +105,7 @@ export default function render(props) { {ThousandCont(ToYuan(data.price || 0), 2)}
-