修改sysAccountOper中type,offlineAccount、wpAccount的action

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";
 

src/configuration/attrUpdateMatrix.ts

@@ -143,7 +143,7 @@ const attrUpdateMatrix: AttrUpdateMatrix<EntityDict> = {
             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<EntityDict> = {
                 enabled: true,
             },
         },
-        withdrawTransferLossRatio: {            
+        withdrawTransferLossRatio: {
             actions: ['update'],
             filter: {
                 enabled: true,
@@ -205,7 +205,7 @@ const attrUpdateMatrix: AttrUpdateMatrix<EntityDict> = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         }
     },
     withdrawAccount: {

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<Schema, Action, '', {
     type: Schema['type'];
@@ -62,14 +63,17 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
                     alipay: '支付宝',
                     wechat: '微信',
                     shouqianba: '收钱吧',
-                    others: '其它',                    
+                    others: '其它',
                 },
             },
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -87,9 +91,12 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
-            tax: '',            
+            tax: '',
         }
     },
 };

src/entities/SysAccountOper.ts

@@ -12,8 +12,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as Refund } from './Refund';
 import { Schema as WithdrawTransfer } from './WithdrawTransfer';
 import { Schema as SysAccountMove } from './SysAccountMove';
-
-export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';
+import { SysAccountOperType } from '../types/sysAccountOper';
 
 export interface Schema extends EntityShape {
     delta: Price;
@@ -40,7 +39,7 @@ export const entityDesc: EntityDesc<Schema, '', '', {
                 pay: '关联支付',
                 refund: '关联退款',
                 withdrawTransfer: '关联转账提现',
-                sysAccountMove: '系统资金移动'
+                sysAccountMove: '系统资金移动',
             },
             v: {
                 type: {

src/entities/WpAccount.ts

@@ -13,6 +13,7 @@ import { Schema as System } from './System';
 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 {
     wechatPay: WechatPay;
@@ -27,7 +28,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<Schema, Action> = {
     locales: {
@@ -53,8 +54,11 @@ export const entityDesc: EntityDesc<Schema, Action> = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -63,9 +67,12 @@ export const entityDesc: EntityDesc<Schema, Action> = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
-            tax: '',            
+            tax: '',
         }
     }
 };

src/types/sysAccountOper.ts

@@ -0,0 +1 @@
+export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';