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

适配domain的改动

This commit is contained in:
Xu Chang 2025-10-07 18:54:28 +08:00
parent 44b75cebba
commit 1c205e6849
20 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkers/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { Checker } from 'oak-domain/lib/types';
import { RuntimeCxt } from '../types/RuntimeCxt';
declare const checkers: Checker<EntityDict, keyof EntityDict, RuntimeCxt>[];

2
lib/entities/ApAccount.js
View File

@ -33,7 +33,7 @@ exports.entityDesc = {
keyType: '指定应用私钥类型',
gateway: "支付宝网关地址",
wsServiceUrl: 'websocket服务地址',
timeout: "网关超时时间",
timeout: "网关超时时间", //（单位毫秒），默认值是 5000
needEncrypt: "是否需要AES加解密",
encryptKey: 'AES密钥', //调用AES加解密相关接口时需要
},

1
lib/oak-app-domain/ActionAuth/Storage.js
View File

@ -18,7 +18,6 @@ exports.desc = {
type: "object"
}
},
static: true,
actionType: "crud",
actions: action_1.genericActions,
indexes: [

20
lib/oak-app-domain/EntityDict.d.ts vendored
View File

@ -117,12 +117,14 @@ export type ActionAuth = {
Aggregation: DeduceAggregation<ActionAuth["Projection"], ActionAuth["Filter"], ActionAuth["Sorter"]>;
CreateOperationData: FormCreateData<BaseActionAuth.OpSchema & {
relation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]>;
}>;
CreateSingle: OakOperation<"create", ActionAuth["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<ActionAuth["CreateOperationData"]>>;
Create: ActionAuth["CreateSingle"] | ActionAuth["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseActionAuth.OpSchema & {
relation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]> | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>;
}>;
Update: OakOperation<BaseActionAuth.OpUpdateAction, ActionAuth["UpdateOperationData"], ActionAuth["Filter"], ActionAuth["Sorter"]>;
RemoveOperationData: {};
@ -400,11 +402,17 @@ export type Path = {
Sorter: Path["SortNode"][];
Selection: OakSelection<"select", Path["Projection"], Path["Filter"], Path["Sorter"]>;
Aggregation: DeduceAggregation<Path["Projection"], Path["Filter"], Path["Sorter"]>;
CreateOperationData: FormCreateData<BasePath.OpSchema>;
CreateOperationData: FormCreateData<BasePath.OpSchema & {
actionAuth$path?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "path"> | Omit<ActionAuth["CreateOperationData"], "path">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "path">, ActionAuth["Filter"]>)[];
relationAuth$path?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "path"> | Omit<RelationAuth["CreateOperationData"], "path">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "path">, RelationAuth["Filter"]>)[];
}>;
CreateSingle: OakOperation<"create", Path["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<Path["CreateOperationData"]>>;
Create: Path["CreateSingle"] | Path["CreateMulti"];
UpdateOperationData: FormUpdateData<BasePath.OpSchema>;
UpdateOperationData: FormUpdateData<BasePath.OpSchema & {
actionAuth$path?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "path"> | Omit<ActionAuth["CreateOperationData"], "path">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "path">, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[];
relationAuth$path?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "path"> | Omit<RelationAuth["CreateOperationData"], "path">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "path">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
}>;
Update: OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"], Path["Sorter"]>;
RemoveOperationData: {};
Remove: OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"], Path["Sorter"]>;
@ -490,6 +498,9 @@ export type Relation = {
platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation<BasePlatform.OpUpdateAction, Platform["UpdateOperationData"], Platform["Filter"]>;
session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation<BaseSession.OpUpdateAction, Session["UpdateOperationData"], Session["Filter"]>;
toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation<BaseToDo.OpUpdateAction, ToDo["UpdateOperationData"], ToDo["Filter"]>;
actionAuth$relation?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "relation"> | Omit<ActionAuth["CreateOperationData"], "relation">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "relation">, ActionAuth["Filter"]>)[];
relationAuth$sourceRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "sourceRelation"> | Omit<RelationAuth["CreateOperationData"], "sourceRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "sourceRelation">, RelationAuth["Filter"]>)[];
relationAuth$destRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "destRelation"> | Omit<RelationAuth["CreateOperationData"], "destRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "destRelation">, RelationAuth["Filter"]>)[];
userEntityClaim$relation?: (OakOperation<"create", Omit<UserEntityClaim["CreateOperationData"], "relation"> | Omit<UserEntityClaim["CreateOperationData"], "relation">[]> | OakOperation<BaseUserEntityClaim.OpUpdateAction, Omit<UserEntityClaim["UpdateOperationData"], "relation">, UserEntityClaim["Filter"]>)[];
userRelation$relation?: (OakOperation<"create", Omit<UserRelation["CreateOperationData"], "relation"> | Omit<UserRelation["CreateOperationData"], "relation">[]> | OakOperation<BaseUserRelation.OpUpdateAction, Omit<UserRelation["UpdateOperationData"], "relation">, UserRelation["Filter"]>)[];
}>;
@ -500,6 +511,9 @@ export type Relation = {
platform?: OakOperation<"create", Platform["CreateOperationData"]> | OakOperation<BasePlatform.OpUpdateAction, Platform["UpdateOperationData"], Platform["Filter"]> | OakOperation<"remove", Platform["RemoveOperationData"], Platform["Filter"]>;
session?: OakOperation<"create", Session["CreateOperationData"]> | OakOperation<BaseSession.OpUpdateAction, Session["UpdateOperationData"], Session["Filter"]> | OakOperation<"remove", Session["RemoveOperationData"], Session["Filter"]>;
toDo?: OakOperation<"create", ToDo["CreateOperationData"]> | OakOperation<BaseToDo.OpUpdateAction, ToDo["UpdateOperationData"], ToDo["Filter"]> | OakOperation<"remove", ToDo["RemoveOperationData"], ToDo["Filter"]>;
actionAuth$relation?: (OakOperation<"create", Omit<ActionAuth["CreateOperationData"], "relation"> | Omit<ActionAuth["CreateOperationData"], "relation">[]> | OakOperation<BaseActionAuth.OpUpdateAction, Omit<ActionAuth["UpdateOperationData"], "relation">, ActionAuth["Filter"]> | OakOperation<"remove", ActionAuth["RemoveOperationData"], ActionAuth["Filter"]>)[];
relationAuth$sourceRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "sourceRelation"> | Omit<RelationAuth["CreateOperationData"], "sourceRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "sourceRelation">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
relationAuth$destRelation?: (OakOperation<"create", Omit<RelationAuth["CreateOperationData"], "destRelation"> | Omit<RelationAuth["CreateOperationData"], "destRelation">[]> | OakOperation<BaseRelationAuth.OpUpdateAction, Omit<RelationAuth["UpdateOperationData"], "destRelation">, RelationAuth["Filter"]> | OakOperation<"remove", RelationAuth["RemoveOperationData"], RelationAuth["Filter"]>)[];
userEntityClaim$relation?: (OakOperation<"create", Omit<UserEntityClaim["CreateOperationData"], "relation"> | Omit<UserEntityClaim["CreateOperationData"], "relation">[]> | OakOperation<BaseUserEntityClaim.OpUpdateAction, Omit<UserEntityClaim["UpdateOperationData"], "relation">, UserEntityClaim["Filter"]> | OakOperation<"remove", UserEntityClaim["RemoveOperationData"], UserEntityClaim["Filter"]>)[];
userRelation$relation?: (OakOperation<"create", Omit<UserRelation["CreateOperationData"], "relation"> | Omit<UserRelation["CreateOperationData"], "relation">[]> | OakOperation<BaseUserRelation.OpUpdateAction, Omit<UserRelation["UpdateOperationData"], "relation">, UserRelation["Filter"]> | OakOperation<"remove", UserRelation["RemoveOperationData"], UserRelation["Filter"]>)[];
}>;
@ -541,6 +555,7 @@ export type RelationAuth = {
Aggregation: DeduceAggregation<RelationAuth["Projection"], RelationAuth["Filter"], RelationAuth["Sorter"]>;
CreateOperationData: FormCreateData<BaseRelationAuth.OpSchema & {
sourceRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]>;
destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]>;
}>;
CreateSingle: OakOperation<"create", RelationAuth["CreateOperationData"]>;
@ -548,6 +563,7 @@ export type RelationAuth = {
Create: RelationAuth["CreateSingle"] | RelationAuth["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseRelationAuth.OpSchema & {
sourceRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
path?: OakOperation<"create", Path["CreateOperationData"]> | OakOperation<BasePath.OpUpdateAction, Path["UpdateOperationData"], Path["Filter"]> | OakOperation<"remove", Path["RemoveOperationData"], Path["Filter"]>;
destRelation?: OakOperation<"create", Relation["CreateOperationData"]> | OakOperation<BaseRelation.OpUpdateAction, Relation["UpdateOperationData"], Relation["Filter"]> | OakOperation<"remove", Relation["RemoveOperationData"], Relation["Filter"]>;
}>;
Update: OakOperation<BaseRelationAuth.OpUpdateAction, RelationAuth["UpdateOperationData"], RelationAuth["Filter"], RelationAuth["Sorter"]>;

1
lib/oak-app-domain/I18n/Storage.js
View File

@ -37,7 +37,6 @@ exports.desc = {
type: "object"
}
},
static: true,
actionType: "crud",
actions: action_1.genericActions,
indexes: [

2
lib/oak-app-domain/Path/Storage.js
View File

@ -19,7 +19,6 @@ exports.desc = {
}
},
recursive: {
notNull: true,
type: "boolean"
},
sourceEntity: {
@ -36,7 +35,6 @@ exports.desc = {
}
}
},
static: true,
actionType: "crud",
actions: action_1.genericActions,
indexes: [

2
lib/oak-app-domain/Path/_baseSchema.d.ts vendored
View File

@ -5,7 +5,7 @@ import { String, Boolean } from "oak-domain/lib/types/DataType";
export type OpSchema = EntityShape & {
destEntity: String<32>;
value: String<256>;
recursive: Boolean;
recursive?: Boolean | null;
sourceEntity: String<32>;
desc?: String<256> | null;
} & {

1
lib/oak-app-domain/RelationAuth/Storage.js
View File

@ -20,7 +20,6 @@ exports.desc = {
ref: "relation"
}
},
static: true,
actionType: "crud",
actions: action_1.genericActions,
indexes: [

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

@ -22,8 +22,7 @@ exports.desc = {
type: "ref",
ref: "platform"
},
folder // 提现的loss在用户提现时计算
: {
folder: {
type: "varchar",
params: {
length: 16

2
lib/ports/index.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Importation, Exportation } from "oak-domain/lib/types/Port";
import { EntityDict } from "../oak-app-domain/index";
import { EntityDict } from "@oak-app-domain";
import { BRC } from '../types/RuntimeCxt';
export declare const importations: Importation<EntityDict, keyof EntityDict, any, BRC>[];
export declare const exportations: Exportation<EntityDict, keyof EntityDict, any, BRC>[];

2
lib/routines/start.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Routine } from 'oak-domain/lib/types/Timer';
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { BRC } from '../types/RuntimeCxt';
declare const startRoutines: Array<Routine<EntityDict, keyof EntityDict, BRC>>;
export default startRoutines;

2
lib/timers/index.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Timer } from 'oak-domain/lib/types/Timer';
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { BRC } from '../types/RuntimeCxt';
declare const _default: Timer<EntityDict, keyof EntityDict, BRC>[];
export default _default;

2
lib/timers/ship.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Timer } from 'oak-domain/lib/types/Timer';
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { BRC } from '../types/RuntimeCxt';
declare const timers: Array<Timer<EntityDict, 'ship', BRC>>;
export default timers;

2
lib/triggers/deposit.js
View File

@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
const uuid_1 = require("oak-domain/lib/utils/uuid");
const assert_1 = tslib_1.__importDefault(require("assert"));
const payClazz_1 = require("../utils/payClazz");
const constants_1 = require("../config/constants");
const constants_1 = require("@project/config/constants");
const triggers = [
/* {
entity: 'deposit',

2
lib/triggers/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { Trigger } from 'oak-domain/lib/types';
import { BRC } from '../types/RuntimeCxt';
declare const triggers: Trigger<EntityDict, keyof EntityDict, BRC>[];

2
lib/triggers/withdraw.d.ts vendored
View File

@ -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<EntityDict, 'withdraw', BRC>[];
export default triggers;

2
lib/types/Exception.d.ts vendored
View File

@ -1,5 +1,5 @@
import { OakException, OpRecord } from 'oak-domain/lib/types';
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
/**
* 退款时级联创建的opers的price总和小于本次退款金额-订单未结算金额
*/

8
lib/utils/payClazz/AliPay/AliPay.js
View File

@ -193,10 +193,10 @@ class AliPay extends AliPay_debug_1.default {
const qrCodeWidth = this.apProduct.config?.qrCodeWidth || 100;
const params = {
bizContent: {
subject: pay.order?.desc || (pay.orderId ? '订单支付' : '帐户充值'),
out_trade_no: out_trade_no,
total_amount: totalAmount,
product_code: 'FAST_INSTANT_TRADE_PAY',
subject: pay.order?.desc || (pay.orderId ? '订单支付' : '帐户充值'), // 订单标题
out_trade_no: out_trade_no, // 商户订单号，64个字符以内、可包含字母、数字、下划线；需保证在商户端不重复
total_amount: totalAmount, // 订单总金额，单位为元
product_code: 'FAST_INSTANT_TRADE_PAY', // 销售产品码，商家和支付宝签约的产品码
notify_url: payNotifyUrl,
qr_pay_mode: qrPayMode,
qrcode_width: qrCodeWidth,

6
lib/utils/shipClazz/WechatMpShip/WechatMpShip.debug.js
View File

@ -160,9 +160,9 @@ class WechatMpShipDebug {
name: from.name,
mobile: from.phone,
// country: from!.area!.parent!.parent!.name!, //国家
province: from.area.parent.parent.name,
city: from.area.parent.name,
area: from.area.name,
province: from.area.parent.parent.name, //省份
city: from.area.parent.name, //市
area: from.area.name, // 区
address: from.detail, //详细地址
},
receiver: {

2
lib/watchers/index.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Watcher } from 'oak-domain/lib/types';
import { EntityDict } from '../oak-app-domain/index';
import { EntityDict } from '@oak-app-domain';
import { BRC } from '../types/RuntimeCxt';
declare const watchers: Watcher<EntityDict, keyof EntityDict, BRC>[];
export default watchers;