diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index 2ea225ee..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; @@ -17,7 +17,7 @@ export declare function getWithdrawCreateData(params: { 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; @@ -31,7 +31,7 @@ export declare function getWithdrawCreateData(params: { 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; @@ -45,7 +45,7 @@ export declare function getWithdrawCreateData(params: { 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; diff --git a/es/components/AbstractComponents.d.ts b/es/components/AbstractComponents.d.ts index 7bc4fdd2..14d10d0c 100644 --- a/es/components/AbstractComponents.d.ts +++ b/es/components/AbstractComponents.d.ts @@ -20,13 +20,8 @@ declare const List: (props: ReactComponentProps) => React.ReactElement; @@ -46,10 +41,11 @@ declare const ListPro: (props: { tablePagination?: any; rowSelection?: any; disableSerialNumber?: boolean | undefined; - size?: "small" | "middle" | "large" | undefined; + size?: "large" | "middle" | "small" | undefined; scroll?: any; locale?: any; opWidth?: number | undefined; + oakPath?: string | undefined; }) => React.ReactElement; declare const Detail: (props: ReactComponentProps | undefined; diff --git a/es/components/AbstractComponents.js b/es/components/AbstractComponents.js index 45f55231..08494e5d 100644 --- a/es/components/AbstractComponents.js +++ b/es/components/AbstractComponents.js @@ -2,6 +2,7 @@ * 抽象组件在业务层根据EntityDict的重新声明 * by Xc 20230807 */ +// @ts-nocheck import AbsFilterPanel from 'oak-frontend-base/es/components/filterPanel'; import AbsList from 'oak-frontend-base/es/components/list'; import AbsListPro from 'oak-frontend-base/es/components/listPro'; diff --git a/es/components/account/detail/index.json b/es/components/account/detail/index.json index 7ed5501d..0c6bd2de 100644 --- a/es/components/account/detail/index.json +++ b/es/components/account/detail/index.json @@ -2,6 +2,7 @@ "usingComponents": { "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/popup/index", + "l-arc-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/arc-popup/index", "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index", "deposit-new": "../../deposit/new/index" } diff --git a/es/components/account/detail/index.less b/es/components/account/detail/index.less index b85a4ff0..29f71e73 100644 --- a/es/components/account/detail/index.less +++ b/es/components/account/detail/index.less @@ -90,8 +90,8 @@ .ad-container { padding: 24rpx; - margin-bottom: 12rpx; background-color: white; + .safe-area-inset-bottom(); } .uf { diff --git a/es/components/account/detail/index.xml b/es/components/account/detail/index.xml index 96df2740..6bef4d89 100644 --- a/es/components/account/detail/index.xml +++ b/es/components/account/detail/index.xml @@ -47,10 +47,13 @@ - - + this.setTypeFilter()); this.closeChooseTypeMp(); - } + }, + bindrefresherrefresh() { + this.setState({ + refreshing: true + }); + this.refresh(); + setTimeout(() => { + this.setState({ + refreshing: false + }); + }, 1000); + }, } }); diff --git a/es/components/deposit/new/index.xml b/es/components/deposit/new/index.xml index 6a2b9688..e2881e2e 100644 --- a/es/components/deposit/new/index.xml +++ b/es/components/deposit/new/index.xml @@ -4,7 +4,6 @@ + ]} oakPath={oakFullpath}/> ); } return null; diff --git a/es/components/pay/list/web.pc.js b/es/components/pay/list/web.pc.js index 2779825f..e8e798b2 100644 --- a/es/components/pay/list/web.pc.js +++ b/es/components/pay/list/web.pc.js @@ -135,7 +135,7 @@ export default function Render(props) { setSpId(row.id); } } - }}/> + }} oakPath={oakFullpath}/> { clean(); setSpId(''); diff --git a/es/components/refund/list/web.pc.js b/es/components/refund/list/web.pc.js index 761caf01..7a6fc8d3 100644 --- a/es/components/refund/list/web.pc.js +++ b/es/components/refund/list/web.pc.js @@ -118,7 +118,7 @@ export default function Render(props) { setUpsertId(row.id); setUpdateAction(action); } - }}/> + }} oakPath={oakFullpath}/> {upsertRow && { clean(); setUpsertId(''); diff --git a/es/components/sysAccount/transferList/web.pc.js b/es/components/sysAccount/transferList/web.pc.js index e3d52107..209bd0d6 100644 --- a/es/components/sysAccount/transferList/web.pc.js +++ b/es/components/sysAccount/transferList/web.pc.js @@ -39,7 +39,7 @@ export default function Render(props) { label: t('withdrawTransfer:attr.externalId'), width: 120, }, - ]} disabledOp={true}/>); + ]} disabledOp={true} oakPath={oakFullpath}/>); } return (); } diff --git a/es/components/withdrawTransfer/list/web.pc.js b/es/components/withdrawTransfer/list/web.pc.js index 9aed7008..409d7a7e 100644 --- a/es/components/withdrawTransfer/list/web.pc.js +++ b/es/components/withdrawTransfer/list/web.pc.js @@ -89,7 +89,7 @@ export default function Render(props) { ]} onAction={(row, action) => { setUpdateId(row.id, action); setUpdateAction(action); - }}/> + }} oakPath={oakFullpath}/> {updateRow && { setUpdateId('', ''); setUpdateAction(''); @@ -124,7 +124,7 @@ export default function Render(props) { - {`${t('common::pay.symbol')} ${ThousandCont(ToYuan(updateRow.price - updateRow.loss), 2)}`} + {`${t('common::pay.symbol')} ${ThousandCont(ToYuan(updateRow.price - updateRow.loss), 2)}`} {updateAction === 'succeed' && ( diff --git a/es/context/BackendRuntimeContext.d.ts b/es/context/BackendRuntimeContext.d.ts index e8536354..11c2072c 100644 --- a/es/context/BackendRuntimeContext.d.ts +++ b/es/context/BackendRuntimeContext.d.ts @@ -15,7 +15,7 @@ export declare class BackendRuntimeContext | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/es/triggers/withdraw.d.ts b/es/triggers/withdraw.d.ts index 979a44c8..e69f8d6e 100644 --- a/es/triggers/withdraw.d.ts +++ b/es/triggers/withdraw.d.ts @@ -6,6 +6,6 @@ import { BRC } from '../types/RuntimeCxt'; * @param context * @param refunds */ -export declare function updateWithdrawState(context: BRC, id: string): Promise<1 | 0>; +export declare function updateWithdrawState(context: BRC, id: string): Promise<0 | 1>; declare const triggers: Trigger[]; export default triggers; diff --git a/es/types/Exception.d.ts b/es/types/Exception.d.ts index 2a233df0..46a5ad34 100644 --- a/es/types/Exception.d.ts +++ b/es/types/Exception.d.ts @@ -8,6 +8,9 @@ export declare class ExternalPrePayException extends OakE name: string; message: string; opRecords: OpRecord[]; + tag1: string | undefined; + tag2: boolean | undefined; + tag3: any; }; } export declare class RefundExceedMax extends OakException { diff --git a/es/utils/application.d.ts b/es/utils/application.d.ts index 260f0950..e7c4620e 100644 --- a/es/utils/application.d.ts +++ b/es/utils/application.d.ts @@ -14,7 +14,7 @@ export declare const mergedProjection: { type?: number | undefined; systemId?: number | undefined; system?: import("../oak-app-domain/System/Schema").Projection | undefined; - config?: number | import("oak-domain/lib/types").JsonProjection | undefined; + config?: number | import("oak-domain/lib/types").JsonProjection | undefined; style?: number | import("oak-domain/lib/types").JsonProjection | undefined; domainId?: number | undefined; domain?: import("../oak-app-domain/Domain/Schema").Projection | undefined; diff --git a/lib/oak-app-domain/System/Storage.js b/lib/oak-app-domain/System/Storage.js index f6979722..283bc886 100644 --- a/lib/oak-app-domain/System/Storage.js +++ b/lib/oak-app-domain/System/Storage.js @@ -37,7 +37,8 @@ exports.desc = { : { type: "object" }, - entity: { + entity // 如果为true,则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio,则全额退款) + : { type: "varchar", params: { length: 32 diff --git a/lib/types/Exception.d.ts b/lib/types/Exception.d.ts index 2a233df0..46a5ad34 100644 --- a/lib/types/Exception.d.ts +++ b/lib/types/Exception.d.ts @@ -8,6 +8,9 @@ export declare class ExternalPrePayException extends OakE name: string; message: string; opRecords: OpRecord[]; + tag1: string | undefined; + tag2: boolean | undefined; + tag3: any; }; } export declare class RefundExceedMax extends OakException { diff --git a/package.json b/package.json index 19adc7d8..c5eddd45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak-pay-business", - "version": "2.2.4", + "version": "2.2.5", "description": "", "files": [ "lib/**/*", @@ -29,8 +29,8 @@ "dependencies": { "classnames": "^2.3.1", "dayjs": "^1.11.5", - "oak-domain": "~5.0.13", - "oak-frontend-base": "~5.2.6", + "oak-domain": "~5.0.14", + "oak-frontend-base": "~5.2.8", "oak-general-business": "~5.2.4", "wechat-pay-nodejs": "^0.2.3" }, diff --git a/src/components/AbstractComponents.ts b/src/components/AbstractComponents.ts index 5ccc328b..5070e39a 100644 --- a/src/components/AbstractComponents.ts +++ b/src/components/AbstractComponents.ts @@ -2,6 +2,7 @@ * 抽象组件在业务层根据EntityDict的重新声明 * by Xc 20230807 */ +// @ts-nocheck import { EntityDict } from '../oak-app-domain'; diff --git a/src/components/account/detail/index.json b/src/components/account/detail/index.json index 904a0d52..9abd597a 100644 --- a/src/components/account/detail/index.json +++ b/src/components/account/detail/index.json @@ -2,6 +2,7 @@ "usingComponents": { "l-button": "@oak-frontend-base/miniprogram_npm/lin-ui/button/index", "l-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/popup/index", + "l-arc-popup": "@oak-frontend-base/miniprogram_npm/lin-ui/arc-popup/index", "l-dialog": "@oak-frontend-base/miniprogram_npm/lin-ui/dialog/index", "deposit-new": "../../deposit/new/index" } diff --git a/src/components/account/detail/index.less b/src/components/account/detail/index.less index b85a4ff0..29f71e73 100644 --- a/src/components/account/detail/index.less +++ b/src/components/account/detail/index.less @@ -90,8 +90,8 @@ .ad-container { padding: 24rpx; - margin-bottom: 12rpx; background-color: white; + .safe-area-inset-bottom(); } .uf { diff --git a/src/components/account/detail/index.xml b/src/components/account/detail/index.xml index 96df2740..6bef4d89 100644 --- a/src/components/account/detail/index.xml +++ b/src/components/account/detail/index.xml @@ -47,10 +47,13 @@ - - + this.setTypeFilter()) this.closeChooseTypeMp(); - } + }, + bindrefresherrefresh() { + this.setState({ + refreshing: true + }) + this.refresh(); + setTimeout(() => { + this.setState({ + refreshing: false + }) + }, 1000); + + }, } }) \ No newline at end of file diff --git a/src/components/deposit/new/index.xml b/src/components/deposit/new/index.xml index 6a2b9688..e2881e2e 100644 --- a/src/components/deposit/new/index.xml +++ b/src/components/deposit/new/index.xml @@ -4,7 +4,6 @@ ); diff --git a/src/components/pay/list/web.pc.tsx b/src/components/pay/list/web.pc.tsx index 1f865b24..d27a1b53 100644 --- a/src/components/pay/list/web.pc.tsx +++ b/src/components/pay/list/web.pc.tsx @@ -173,6 +173,7 @@ export default function Render(props: WebComponentProps {upsertRow && ) } diff --git a/src/components/withdrawTransfer/list/web.pc.tsx b/src/components/withdrawTransfer/list/web.pc.tsx index b0fa4889..9106339a 100644 --- a/src/components/withdrawTransfer/list/web.pc.tsx +++ b/src/components/withdrawTransfer/list/web.pc.tsx @@ -124,6 +124,7 @@ export default function Render(props: WebComponentProps {updateRow && } {updateRow.withdrawAccount?.name && {updateRow!.withdrawAccount?.name} @@ -175,8 +176,8 @@ export default function Render(props: WebComponentProps{t('saNotEnough')} : + (updateAction === 'succeed' && sysAccountAmount < updateRow!.price! - updateRow.loss!) ? + {t('saNotEnough')} : undefined } > @@ -188,7 +189,7 @@ export default function Render(props: WebComponentProps - {`${t('common::pay.symbol')} ${ThousandCont(ToYuan(updateRow!.price! - updateRow.loss!), 2)}`} + {`${t('common::pay.symbol')} ${ThousandCont(ToYuan(updateRow!.price! - updateRow.loss!), 2)}`} {