From 4160d0b3053f03f70e4613b25acc742a907ffa01 Mon Sep 17 00:00:00 2001 From: qcqcqc <1220204124@zust.edu.cn> Date: Fri, 9 Jan 2026 15:21:36 +0800 Subject: [PATCH] build --- es/oak-app-domain/ActionDefDict.d.ts | 4 +- es/oak-app-domain/ActionDefDict.js | 4 +- es/oak-app-domain/EntityDict.d.ts | 100 +++++++++++++------------- es/oak-app-domain/Storage.js | 4 +- es/oak-app-domain/StyleDict.js | 4 +- es/oak-app-domain/System/Storage.js | 3 +- lib/oak-app-domain/ActionDefDict.d.ts | 4 +- lib/oak-app-domain/ActionDefDict.js | 8 +-- lib/oak-app-domain/EntityDict.d.ts | 100 +++++++++++++------------- lib/oak-app-domain/Storage.js | 8 +-- lib/oak-app-domain/StyleDict.js | 8 +-- lib/oak-app-domain/System/Storage.js | 3 +- 12 files changed, 126 insertions(+), 124 deletions(-) diff --git a/es/oak-app-domain/ActionDefDict.d.ts b/es/oak-app-domain/ActionDefDict.d.ts index 3a45883c..254d266e 100644 --- a/es/oak-app-domain/ActionDefDict.d.ts +++ b/es/oak-app-domain/ActionDefDict.d.ts @@ -73,10 +73,10 @@ export declare const actionDefDict: { refund: { iState: import("oak-domain/lib/types").ActionDef; }; - settlePlan: { + settlement: { iState: import("oak-domain/lib/types").ActionDef; }; - settlement: { + settlePlan: { iState: import("oak-domain/lib/types").ActionDef; }; ship: { diff --git a/es/oak-app-domain/ActionDefDict.js b/es/oak-app-domain/ActionDefDict.js index 9850c430..5e4efdc6 100644 --- a/es/oak-app-domain/ActionDefDict.js +++ b/es/oak-app-domain/ActionDefDict.js @@ -27,8 +27,8 @@ import { actionDefDict as offlineAccount } from "./OfflineAccount/Action"; import { actionDefDict as order } from "./Order/Action"; import { actionDefDict as pay } from "./Pay/Action"; import { actionDefDict as refund } from "./Refund/Action"; -import { actionDefDict as settlePlan } from "./SettlePlan/Action"; import { actionDefDict as settlement } from "./Settlement/Action"; +import { actionDefDict as settlePlan } from "./SettlePlan/Action"; import { actionDefDict as ship } from "./Ship/Action"; import { actionDefDict as user } from "./User/Action"; import { actionDefDict as withdraw } from "./Withdraw/Action"; @@ -66,8 +66,8 @@ export const actionDefDict = { order, pay, refund, - settlePlan, settlement, + settlePlan, ship, user, withdraw, diff --git a/es/oak-app-domain/EntityDict.d.ts b/es/oak-app-domain/EntityDict.d.ts index 64acbdcd..d7642b1c 100644 --- a/es/oak-app-domain/EntityDict.d.ts +++ b/es/oak-app-domain/EntityDict.d.ts @@ -78,8 +78,8 @@ import * as BaseOfflineAccount from "./OfflineAccount/_baseSchema"; import * as BaseOrder from "./Order/_baseSchema"; import * as BasePay from "./Pay/_baseSchema"; import * as BaseRefund from "./Refund/_baseSchema"; -import * as BaseSettlePlan from "./SettlePlan/_baseSchema"; import * as BaseSettlement from "./Settlement/_baseSchema"; +import * as BaseSettlePlan from "./SettlePlan/_baseSchema"; import * as BaseShip from "./Ship/_baseSchema"; import * as BaseShipCompany from "./ShipCompany/_baseSchema"; import * as BaseShipOrder from "./ShipOrder/_baseSchema"; @@ -5249,54 +5249,6 @@ export type Refund = { Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>; Operation: Refund["Create"] | Refund["Update"] | Refund["Remove"]; }; -export type SettlePlan = { - OpSchema: BaseSettlePlan.OpSchema; - Action: BaseSettlePlan.OpAction; - Schema: BaseSettlePlan.OpSchema & { - order: Order["Schema"]; - settlement$plan?: Array>; - settlement$plan$$aggr?: AggregationResult>; - }; - Projection: BaseSettlePlan.OpProjection & { - order?: Order["Projection"]; - settlement$plan?: OakSelection<"select", Omit, Omit, Settlement["Sorter"]> & { - $entity: "settlement"; - }; - settlement$plan$$aggr?: DeduceAggregation, Omit, Settlement["Sorter"]> & { - $entity: "settlement"; - }; - }; - FilterUnit: BaseSettlePlan.OpFilter & { - order: MakeFilter; - settlement$plan: MakeFilter> & SubQueryPredicateMetadata; - }; - Filter: MakeFilter; - SortAttr: Partial; - SortNode: { - $attr: SettlePlan["SortAttr"]; - $direction?: "asc" | "desc"; - }; - Sorter: SettlePlan["SortNode"][]; - Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>; - Aggregation: DeduceAggregation; - CreateOperationData: FormCreateData | OakOperation; - settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]>)[]; - }>; - CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>; - CreateMulti: OakOperation<"create", Array>; - Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"]; - UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>; - settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[]; - }>; - Update: OakOperation; - RemoveOperationData: {}; - Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>; - Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"]; -}; export type Settlement = { OpSchema: BaseSettlement.OpSchema; Action: BaseSettlement.OpAction; @@ -5351,6 +5303,54 @@ export type Settlement = { Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>; Operation: Settlement["Create"] | Settlement["Update"] | Settlement["Remove"]; }; +export type SettlePlan = { + OpSchema: BaseSettlePlan.OpSchema; + Action: BaseSettlePlan.OpAction; + Schema: BaseSettlePlan.OpSchema & { + order: Order["Schema"]; + settlement$plan?: Array>; + settlement$plan$$aggr?: AggregationResult>; + }; + Projection: BaseSettlePlan.OpProjection & { + order?: Order["Projection"]; + settlement$plan?: OakSelection<"select", Omit, Omit, Settlement["Sorter"]> & { + $entity: "settlement"; + }; + settlement$plan$$aggr?: DeduceAggregation, Omit, Settlement["Sorter"]> & { + $entity: "settlement"; + }; + }; + FilterUnit: BaseSettlePlan.OpFilter & { + order: MakeFilter; + settlement$plan: MakeFilter> & SubQueryPredicateMetadata; + }; + Filter: MakeFilter; + SortAttr: Partial; + SortNode: { + $attr: SettlePlan["SortAttr"]; + $direction?: "asc" | "desc"; + }; + Sorter: SettlePlan["SortNode"][]; + Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>; + Aggregation: DeduceAggregation; + CreateOperationData: FormCreateData | OakOperation; + settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]>)[]; + }>; + CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>; + CreateMulti: OakOperation<"create", Array>; + Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"]; + UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>; + settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[]; + }>; + Update: OakOperation; + RemoveOperationData: {}; + Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>; + Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"]; +}; export type Ship = { OpSchema: BaseShip.OpSchema; Action: BaseShip.OpAction; @@ -6343,8 +6343,8 @@ export type EntityDict = { order: Order; pay: Pay; refund: Refund; - settlePlan: SettlePlan; settlement: Settlement; + settlePlan: SettlePlan; ship: Ship; shipCompany: ShipCompany; shipOrder: ShipOrder; diff --git a/es/oak-app-domain/Storage.js b/es/oak-app-domain/Storage.js index c69a2fbc..fd28ec55 100644 --- a/es/oak-app-domain/Storage.js +++ b/es/oak-app-domain/Storage.js @@ -76,8 +76,8 @@ import { desc as offlineAccountDesc } from "./OfflineAccount/Storage"; import { desc as orderDesc } from "./Order/Storage"; import { desc as payDesc } from "./Pay/Storage"; import { desc as refundDesc } from "./Refund/Storage"; -import { desc as settlePlanDesc } from "./SettlePlan/Storage"; import { desc as settlementDesc } from "./Settlement/Storage"; +import { desc as settlePlanDesc } from "./SettlePlan/Storage"; import { desc as shipDesc } from "./Ship/Storage"; import { desc as shipCompanyDesc } from "./ShipCompany/Storage"; import { desc as shipOrderDesc } from "./ShipOrder/Storage"; @@ -172,8 +172,8 @@ export const storageSchema = { order: orderDesc, pay: payDesc, refund: refundDesc, - settlePlan: settlePlanDesc, settlement: settlementDesc, + settlePlan: settlePlanDesc, ship: shipDesc, shipCompany: shipCompanyDesc, shipOrder: shipOrderDesc, diff --git a/es/oak-app-domain/StyleDict.js b/es/oak-app-domain/StyleDict.js index 10b89671..388e3108 100644 --- a/es/oak-app-domain/StyleDict.js +++ b/es/oak-app-domain/StyleDict.js @@ -39,8 +39,8 @@ import { style as offlineAccount } from "./OfflineAccount/Style"; import { style as order } from "./Order/Style"; import { style as pay } from "./Pay/Style"; import { style as refund } from "./Refund/Style"; -import { style as settlePlan } from "./SettlePlan/Style"; import { style as settlement } from "./Settlement/Style"; +import { style as settlePlan } from "./SettlePlan/Style"; import { style as ship } from "./Ship/Style"; import { style as sysAccountOper } from "./SysAccountOper/Style"; import { style as user } from "./User/Style"; @@ -92,8 +92,8 @@ export const styleDict = { order, pay, refund, - settlePlan, settlement, + settlePlan, ship, sysAccountOper, user, diff --git a/es/oak-app-domain/System/Storage.js b/es/oak-app-domain/System/Storage.js index 33d477ea..92df1cec 100644 --- a/es/oak-app-domain/System/Storage.js +++ b/es/oak-app-domain/System/Storage.js @@ -19,7 +19,8 @@ export const desc = { type: "ref", ref: "platform" }, - folder: { + folder // 提现的loss在用户提现时计算 + : { type: "varchar", params: { length: 16 diff --git a/lib/oak-app-domain/ActionDefDict.d.ts b/lib/oak-app-domain/ActionDefDict.d.ts index 3a45883c..254d266e 100644 --- a/lib/oak-app-domain/ActionDefDict.d.ts +++ b/lib/oak-app-domain/ActionDefDict.d.ts @@ -73,10 +73,10 @@ export declare const actionDefDict: { refund: { iState: import("oak-domain/lib/types").ActionDef; }; - settlePlan: { + settlement: { iState: import("oak-domain/lib/types").ActionDef; }; - settlement: { + settlePlan: { iState: import("oak-domain/lib/types").ActionDef; }; ship: { diff --git a/lib/oak-app-domain/ActionDefDict.js b/lib/oak-app-domain/ActionDefDict.js index bdf91637..95780c48 100644 --- a/lib/oak-app-domain/ActionDefDict.js +++ b/lib/oak-app-domain/ActionDefDict.js @@ -30,8 +30,8 @@ const Action_26 = require("./OfflineAccount/Action"); const Action_27 = require("./Order/Action"); const Action_28 = require("./Pay/Action"); const Action_29 = require("./Refund/Action"); -const Action_30 = require("./SettlePlan/Action"); -const Action_31 = require("./Settlement/Action"); +const Action_30 = require("./Settlement/Action"); +const Action_31 = require("./SettlePlan/Action"); const Action_32 = require("./Ship/Action"); const Action_33 = require("./User/Action"); const Action_34 = require("./Withdraw/Action"); @@ -69,8 +69,8 @@ exports.actionDefDict = { order: Action_27.actionDefDict, pay: Action_28.actionDefDict, refund: Action_29.actionDefDict, - settlePlan: Action_30.actionDefDict, - settlement: Action_31.actionDefDict, + settlement: Action_30.actionDefDict, + settlePlan: Action_31.actionDefDict, ship: Action_32.actionDefDict, user: Action_33.actionDefDict, withdraw: Action_34.actionDefDict, diff --git a/lib/oak-app-domain/EntityDict.d.ts b/lib/oak-app-domain/EntityDict.d.ts index 64acbdcd..d7642b1c 100644 --- a/lib/oak-app-domain/EntityDict.d.ts +++ b/lib/oak-app-domain/EntityDict.d.ts @@ -78,8 +78,8 @@ import * as BaseOfflineAccount from "./OfflineAccount/_baseSchema"; import * as BaseOrder from "./Order/_baseSchema"; import * as BasePay from "./Pay/_baseSchema"; import * as BaseRefund from "./Refund/_baseSchema"; -import * as BaseSettlePlan from "./SettlePlan/_baseSchema"; import * as BaseSettlement from "./Settlement/_baseSchema"; +import * as BaseSettlePlan from "./SettlePlan/_baseSchema"; import * as BaseShip from "./Ship/_baseSchema"; import * as BaseShipCompany from "./ShipCompany/_baseSchema"; import * as BaseShipOrder from "./ShipOrder/_baseSchema"; @@ -5249,54 +5249,6 @@ export type Refund = { Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>; Operation: Refund["Create"] | Refund["Update"] | Refund["Remove"]; }; -export type SettlePlan = { - OpSchema: BaseSettlePlan.OpSchema; - Action: BaseSettlePlan.OpAction; - Schema: BaseSettlePlan.OpSchema & { - order: Order["Schema"]; - settlement$plan?: Array>; - settlement$plan$$aggr?: AggregationResult>; - }; - Projection: BaseSettlePlan.OpProjection & { - order?: Order["Projection"]; - settlement$plan?: OakSelection<"select", Omit, Omit, Settlement["Sorter"]> & { - $entity: "settlement"; - }; - settlement$plan$$aggr?: DeduceAggregation, Omit, Settlement["Sorter"]> & { - $entity: "settlement"; - }; - }; - FilterUnit: BaseSettlePlan.OpFilter & { - order: MakeFilter; - settlement$plan: MakeFilter> & SubQueryPredicateMetadata; - }; - Filter: MakeFilter; - SortAttr: Partial; - SortNode: { - $attr: SettlePlan["SortAttr"]; - $direction?: "asc" | "desc"; - }; - Sorter: SettlePlan["SortNode"][]; - Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>; - Aggregation: DeduceAggregation; - CreateOperationData: FormCreateData | OakOperation; - settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]>)[]; - }>; - CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>; - CreateMulti: OakOperation<"create", Array>; - Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"]; - UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>; - settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[]; - }>; - Update: OakOperation; - RemoveOperationData: {}; - Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>; - Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"]; -}; export type Settlement = { OpSchema: BaseSettlement.OpSchema; Action: BaseSettlement.OpAction; @@ -5351,6 +5303,54 @@ export type Settlement = { Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>; Operation: Settlement["Create"] | Settlement["Update"] | Settlement["Remove"]; }; +export type SettlePlan = { + OpSchema: BaseSettlePlan.OpSchema; + Action: BaseSettlePlan.OpAction; + Schema: BaseSettlePlan.OpSchema & { + order: Order["Schema"]; + settlement$plan?: Array>; + settlement$plan$$aggr?: AggregationResult>; + }; + Projection: BaseSettlePlan.OpProjection & { + order?: Order["Projection"]; + settlement$plan?: OakSelection<"select", Omit, Omit, Settlement["Sorter"]> & { + $entity: "settlement"; + }; + settlement$plan$$aggr?: DeduceAggregation, Omit, Settlement["Sorter"]> & { + $entity: "settlement"; + }; + }; + FilterUnit: BaseSettlePlan.OpFilter & { + order: MakeFilter; + settlement$plan: MakeFilter> & SubQueryPredicateMetadata; + }; + Filter: MakeFilter; + SortAttr: Partial; + SortNode: { + $attr: SettlePlan["SortAttr"]; + $direction?: "asc" | "desc"; + }; + Sorter: SettlePlan["SortNode"][]; + Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>; + Aggregation: DeduceAggregation; + CreateOperationData: FormCreateData | OakOperation; + settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]>)[]; + }>; + CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>; + CreateMulti: OakOperation<"create", Array>; + Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"]; + UpdateOperationData: FormUpdateData | OakOperation | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>; + settlement$plan?: (OakOperation<"create", Omit | Omit[]> | OakOperation, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[]; + }>; + Update: OakOperation; + RemoveOperationData: {}; + Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>; + Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"]; +}; export type Ship = { OpSchema: BaseShip.OpSchema; Action: BaseShip.OpAction; @@ -6343,8 +6343,8 @@ export type EntityDict = { order: Order; pay: Pay; refund: Refund; - settlePlan: SettlePlan; settlement: Settlement; + settlePlan: SettlePlan; ship: Ship; shipCompany: ShipCompany; shipOrder: ShipOrder; diff --git a/lib/oak-app-domain/Storage.js b/lib/oak-app-domain/Storage.js index f0e1be4a..5c200119 100644 --- a/lib/oak-app-domain/Storage.js +++ b/lib/oak-app-domain/Storage.js @@ -79,8 +79,8 @@ const Storage_75 = require("./OfflineAccount/Storage"); const Storage_76 = require("./Order/Storage"); const Storage_77 = require("./Pay/Storage"); const Storage_78 = require("./Refund/Storage"); -const Storage_79 = require("./SettlePlan/Storage"); -const Storage_80 = require("./Settlement/Storage"); +const Storage_79 = require("./Settlement/Storage"); +const Storage_80 = require("./SettlePlan/Storage"); const Storage_81 = require("./Ship/Storage"); const Storage_82 = require("./ShipCompany/Storage"); const Storage_83 = require("./ShipOrder/Storage"); @@ -175,8 +175,8 @@ exports.storageSchema = { order: Storage_76.desc, pay: Storage_77.desc, refund: Storage_78.desc, - settlePlan: Storage_79.desc, - settlement: Storage_80.desc, + settlement: Storage_79.desc, + settlePlan: Storage_80.desc, ship: Storage_81.desc, shipCompany: Storage_82.desc, shipOrder: Storage_83.desc, diff --git a/lib/oak-app-domain/StyleDict.js b/lib/oak-app-domain/StyleDict.js index d66752df..ad0aa4d7 100644 --- a/lib/oak-app-domain/StyleDict.js +++ b/lib/oak-app-domain/StyleDict.js @@ -42,8 +42,8 @@ const Style_38 = require("./OfflineAccount/Style"); const Style_39 = require("./Order/Style"); const Style_40 = require("./Pay/Style"); const Style_41 = require("./Refund/Style"); -const Style_42 = require("./SettlePlan/Style"); -const Style_43 = require("./Settlement/Style"); +const Style_42 = require("./Settlement/Style"); +const Style_43 = require("./SettlePlan/Style"); const Style_44 = require("./Ship/Style"); const Style_45 = require("./SysAccountOper/Style"); const Style_46 = require("./User/Style"); @@ -95,8 +95,8 @@ exports.styleDict = { order: Style_39.style, pay: Style_40.style, refund: Style_41.style, - settlePlan: Style_42.style, - settlement: Style_43.style, + settlement: Style_42.style, + settlePlan: Style_43.style, ship: Style_44.style, sysAccountOper: Style_45.style, user: Style_46.style, diff --git a/lib/oak-app-domain/System/Storage.js b/lib/oak-app-domain/System/Storage.js index 5d309538..423f8f47 100644 --- a/lib/oak-app-domain/System/Storage.js +++ b/lib/oak-app-domain/System/Storage.js @@ -22,7 +22,8 @@ exports.desc = { type: "ref", ref: "platform" }, - folder: { + folder // 提现的loss在用户提现时计算 + : { type: "varchar", params: { length: 16