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