Oak-Team
/
oak-pay-business
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

适配general中entities变化

This commit is contained in:
lxy 2025-02-05 10:41:36 +08:00
parent 9d8cac5193
commit 7edea95b78
29 changed files with 136 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
es/entities/System.js
View File

@ -16,6 +16,7 @@ export const entityDesc = {
entityId: '关联对象id',
accounts: '关联账户',
withdrawAccounts: '关联提现账户',
oldestVersion: '支持app最低版本',
},
},
}

15
es/oak-app-domain/Application/Storage.js
View File

@ -28,6 +28,21 @@ export const desc = {
style: {
type: "object"
},
dangerousVersions: {
notNull: true,
type: "object"
},
warningVersions: {
notNull: true,
type: "object"
},
soaVersion: {
notNull: true,
type: "varchar",
params: {
length: 12
}
},
domainId: {
type: "ref",
ref: "domain"

14
es/oak-app-domain/Application/_baseSchema.d.ts vendored
View File

@ -75,6 +75,7 @@ export type NativeConfig = {
port: string;
};
};
type Versions = string[];
export type OpSchema = EntityShape & {
name: String<32>;
description?: Text | null;
@ -82,6 +83,9 @@ export type OpSchema = EntityShape & {
systemId: ForeignKey<"system">;
config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig;
style?: Style | null;
dangerousVersions: Versions;
warningVersions: Versions;
soaVersion: String<12>;
domainId?: ForeignKey<"domain"> | null;
} & {
[A in ExpressionKey]?: any;
@ -98,6 +102,9 @@ export type OpFilter = {
systemId: Q_StringValue;
config: JsonFilter<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
style: JsonFilter<Style>;
dangerousVersions: JsonFilter<Versions>;
warningVersions: JsonFilter<Versions>;
soaVersion: Q_StringValue;
domainId: Q_StringValue;
} & ExprOp<OpAttr | string>;
export type OpProjection = {
@ -113,6 +120,9 @@ export type OpProjection = {
systemId?: number;
config?: number | JsonProjection<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
style?: number | JsonProjection<Style>;
dangerousVersions?: number | JsonProjection<Versions>;
warningVersions?: number | JsonProjection<Versions>;
soaVersion?: number;
domainId?: number;
} & Partial<ExprOp<OpAttr | string>>;
export type OpSortAttr = Partial<{
@ -124,7 +134,11 @@ export type OpSortAttr = Partial<{
description: number;
type: number;
style: number;
dangerousVersions: number;
warningVersions: number;
soaVersion: number;
[k: string]: any;
} | ExprOp<OpAttr | string>>;
export type OpAction = OakMakeAction<GenericAction | string>;
export type OpUpdateAction = "update" | string;
export {};

1
es/oak-app-domain/Application/_baseSchema.js Normal file
View File

@ -0,0 +1 @@
export {};

5
es/oak-app-domain/Application/locales/zh_CN.json
View File

@ -8,7 +8,10 @@
"config": "设置",
"style": "样式",
"sessions": "会话",
"domain": "域名"
"domain": "域名",
"dangerousVersions": "强制升级版本",
"warningVersions": "建议升级版本",
"soaVersion": "最新发布版本"
},
"v": {
"type": {

6
es/oak-app-domain/Platform/Storage.js
View File

@ -15,6 +15,12 @@ export const desc = {
notNull: true,
type: "object"
},
oldestVersion: {
type: "varchar",
params: {
length: 32
}
},
style: {
type: "object"
},

4
es/oak-app-domain/Platform/_baseSchema.d.ts vendored
View File

@ -9,6 +9,7 @@ export type OpSchema = EntityShape & {
name: String<32>;
description?: Text | null;
config: Config;
oldestVersion?: String<32> | null;
style?: Style | null;
entity?: String<32> | null;
entityId?: String<64> | null;
@ -24,6 +25,7 @@ export type OpFilter = {
name: Q_StringValue;
description: Q_StringValue;
config: JsonFilter<Config>;
oldestVersion: Q_StringValue;
style: JsonFilter<Style>;
entity: Q_StringValue;
entityId: Q_StringValue;
@ -38,6 +40,7 @@ export type OpProjection = {
name?: number;
description?: number;
config?: number | JsonProjection<Config>;
oldestVersion?: number;
style?: number | JsonProjection<Style>;
entity?: number;
entityId?: number;
@ -50,6 +53,7 @@ export type OpSortAttr = Partial<{
name: number;
description: number;
config: number;
oldestVersion: number;
style: number;
entity: number;
entityId: number;

1
es/oak-app-domain/Platform/_baseSchema.js Normal file
View File

@ -0,0 +1 @@
export {};

3
es/oak-app-domain/Platform/locales/zh_CN.json
View File

@ -6,7 +6,8 @@
"config": "设置",
"style": "样式",
"entity": "关联对象",
"entityId": "关联对象id"
"entityId": "关联对象id",
"oldestVersion": "支持app最低版本"
},
"r": {
"owner": "拥有者",

15
es/oak-app-domain/System/Storage.js
View File

@ -19,21 +19,26 @@ export const desc = {
type: "ref",
ref: "platform"
},
folder // 提现的loss在用户提现时计算
: {
folder: {
type: "varchar",
params: {
length: 16
}
},
super: {
oldestVersion: {
type: "varchar",
params: {
length: 32
}
},
super // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
: {
type: "boolean"
},
style: {
type: "object"
},
entity // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
: {
entity: {
type: "varchar",
params: {
length: 32

4
es/oak-app-domain/System/_baseSchema.d.ts vendored
View File

@ -25,6 +25,7 @@ export type OpSchema = EntityShape & {
config: Config;
platformId?: ForeignKey<"platform"> | null;
folder?: String<16> | null;
oldestVersion?: String<32> | null;
super?: Boolean | null;
style?: Style | null;
entity?: String<32> | null;
@ -44,6 +45,7 @@ export type OpFilter = {
config: JsonFilter<Config>;
platformId: Q_StringValue;
folder: Q_StringValue;
oldestVersion: Q_StringValue;
super: Q_BooleanValue;
style: JsonFilter<Style>;
entity: Q_StringValue;
@ -62,6 +64,7 @@ export type OpProjection = {
config?: number | JsonProjection<Config>;
platformId?: number;
folder?: number;
oldestVersion?: number;
super?: number;
style?: number | JsonProjection<Style>;
entity?: number;
@ -77,6 +80,7 @@ export type OpSortAttr = Partial<{
description: number;
config: number;
folder: number;
oldestVersion: number;
super: number;
style: number;
entity: number;

1
es/oak-app-domain/System/_baseSchema.js Normal file
View File

@ -0,0 +1 @@
export {};

3
es/oak-app-domain/System/locales/zh_CN.json
View File

@ -12,6 +12,7 @@
"entity": "关联对象",
"entityId": "关联对象id",
"accounts": "关联账户",
"withdrawAccounts": "关联提现账户"
"withdrawAccounts": "关联提现账户",
"oldestVersion": "支持app最低版本"
}
}

2
es/utils/payClazz/WechatPay/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import WechatPay from './WechatPay';
import WechatPayDebug from './WechatPay.debug';
declare const _default: typeof WechatPayDebug | typeof WechatPay;
declare const _default: typeof WechatPay | typeof WechatPayDebug;
export default _default;

1
lib/entities/System.js
View File

@ -19,6 +19,7 @@ exports.entityDesc = {
entityId: '关联对象id',
accounts: '关联账户',
withdrawAccounts: '关联提现账户',
oldestVersion: '支持app最低版本',
},
},
}

15
lib/oak-app-domain/Application/Storage.js
View File

@ -31,6 +31,21 @@ exports.desc = {
style: {
type: "object"
},
dangerousVersions: {
notNull: true,
type: "object"
},
warningVersions: {
notNull: true,
type: "object"
},
soaVersion: {
notNull: true,
type: "varchar",
params: {
length: 12
}
},
domainId: {
type: "ref",
ref: "domain"

14
lib/oak-app-domain/Application/_baseSchema.d.ts vendored
View File

@ -75,6 +75,7 @@ export type NativeConfig = {
port: string;
};
};
type Versions = string[];
export type OpSchema = EntityShape & {
name: String<32>;
description?: Text | null;
@ -82,6 +83,9 @@ export type OpSchema = EntityShape & {
systemId: ForeignKey<"system">;
config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig;
style?: Style | null;
dangerousVersions: Versions;
warningVersions: Versions;
soaVersion: String<12>;
domainId?: ForeignKey<"domain"> | null;
} & {
[A in ExpressionKey]?: any;
@ -98,6 +102,9 @@ export type OpFilter = {
systemId: Q_StringValue;
config: JsonFilter<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
style: JsonFilter<Style>;
dangerousVersions: JsonFilter<Versions>;
warningVersions: JsonFilter<Versions>;
soaVersion: Q_StringValue;
domainId: Q_StringValue;
} & ExprOp<OpAttr | string>;
export type OpProjection = {
@ -113,6 +120,9 @@ export type OpProjection = {
systemId?: number;
config?: number | JsonProjection<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
style?: number | JsonProjection<Style>;
dangerousVersions?: number | JsonProjection<Versions>;
warningVersions?: number | JsonProjection<Versions>;
soaVersion?: number;
domainId?: number;
} & Partial<ExprOp<OpAttr | string>>;
export type OpSortAttr = Partial<{
@ -124,7 +134,11 @@ export type OpSortAttr = Partial<{
description: number;
type: number;
style: number;
dangerousVersions: number;
warningVersions: number;
soaVersion: number;
[k: string]: any;
} | ExprOp<OpAttr | string>>;
export type OpAction = OakMakeAction<GenericAction | string>;
export type OpUpdateAction = "update" | string;
export {};

2
lib/oak-app-domain/Application/_baseSchema.js Normal file
View File

@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });

5
lib/oak-app-domain/Application/locales/zh_CN.json
View File

@ -8,7 +8,10 @@
"config": "设置",
"style": "样式",
"sessions": "会话",
"domain": "域名"
"domain": "域名",
"dangerousVersions": "强制升级版本",
"warningVersions": "建议升级版本",
"soaVersion": "最新发布版本"
},
"v": {
"type": {

6
lib/oak-app-domain/Platform/Storage.js
View File

@ -18,6 +18,12 @@ exports.desc = {
notNull: true,
type: "object"
},
oldestVersion: {
type: "varchar",
params: {
length: 32
}
},
style: {
type: "object"
},

4
lib/oak-app-domain/Platform/_baseSchema.d.ts vendored
View File

@ -9,6 +9,7 @@ export type OpSchema = EntityShape & {
name: String<32>;
description?: Text | null;
config: Config;
oldestVersion?: String<32> | null;
style?: Style | null;
entity?: String<32> | null;
entityId?: String<64> | null;
@ -24,6 +25,7 @@ export type OpFilter = {
name: Q_StringValue;
description: Q_StringValue;
config: JsonFilter<Config>;
oldestVersion: Q_StringValue;
style: JsonFilter<Style>;
entity: Q_StringValue;
entityId: Q_StringValue;
@ -38,6 +40,7 @@ export type OpProjection = {
name?: number;
description?: number;
config?: number | JsonProjection<Config>;
oldestVersion?: number;
style?: number | JsonProjection<Style>;
entity?: number;
entityId?: number;
@ -50,6 +53,7 @@ export type OpSortAttr = Partial<{
name: number;
description: number;
config: number;
oldestVersion: number;
style: number;
entity: number;
entityId: number;

2
lib/oak-app-domain/Platform/_baseSchema.js Normal file
View File

@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });

3
lib/oak-app-domain/Platform/locales/zh_CN.json
View File

@ -6,7 +6,8 @@
"config": "设置",
"style": "样式",
"entity": "关联对象",
"entityId": "关联对象id"
"entityId": "关联对象id",
"oldestVersion": "支持app最低版本"
},
"r": {
"owner": "拥有者",

15
lib/oak-app-domain/System/Storage.js
View File

@ -22,21 +22,26 @@ exports.desc = {
type: "ref",
ref: "platform"
},
folder // 提现的loss在用户提现时计算
: {
folder: {
type: "varchar",
params: {
length: 16
}
},
super: {
oldestVersion: {
type: "varchar",
params: {
length: 32
}
},
super // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
: {
type: "boolean"
},
style: {
type: "object"
},
entity // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
: {
entity: {
type: "varchar",
params: {
length: 32

4
lib/oak-app-domain/System/_baseSchema.d.ts vendored
View File

@ -25,6 +25,7 @@ export type OpSchema = EntityShape & {
config: Config;
platformId?: ForeignKey<"platform"> | null;
folder?: String<16> | null;
oldestVersion?: String<32> | null;
super?: Boolean | null;
style?: Style | null;
entity?: String<32> | null;
@ -44,6 +45,7 @@ export type OpFilter = {
config: JsonFilter<Config>;
platformId: Q_StringValue;
folder: Q_StringValue;
oldestVersion: Q_StringValue;
super: Q_BooleanValue;
style: JsonFilter<Style>;
entity: Q_StringValue;
@ -62,6 +64,7 @@ export type OpProjection = {
config?: number | JsonProjection<Config>;
platformId?: number;
folder?: number;
oldestVersion?: number;
super?: number;
style?: number | JsonProjection<Style>;
entity?: number;
@ -77,6 +80,7 @@ export type OpSortAttr = Partial<{
description: number;
config: number;
folder: number;
oldestVersion: number;
super: number;
style: number;
entity: number;

2
lib/oak-app-domain/System/_baseSchema.js Normal file
View File

@ -0,0 +1,2 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });

3
lib/oak-app-domain/System/locales/zh_CN.json
View File

@ -12,6 +12,7 @@
"entity": "关联对象",
"entityId": "关联对象id",
"accounts": "关联账户",
"withdrawAccounts": "关联提现账户"
"withdrawAccounts": "关联提现账户",
"oldestVersion": "支持app最低版本"
}
}

2
lib/utils/payClazz/WechatPay/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import WechatPay from './WechatPay';
import WechatPayDebug from './WechatPay.debug';
declare const _default: typeof WechatPayDebug | typeof WechatPay;
declare const _default: typeof WechatPay | typeof WechatPayDebug;
export default _default;

1
src/entities/System.ts
View File

@ -44,6 +44,7 @@ export const entityDesc: EntityDesc<Schema> = {
entityId: '关联对象id',
accounts: '关联账户',
withdrawAccounts: '关联提现账户',
oldestVersion: '支持app最低版本',
},
},
}