This commit is contained in:
Pan Qiancheng 2026-01-09 15:21:36 +08:00
parent 22ccb83a46
commit 4160d0b305
12 changed files with 126 additions and 124 deletions

View File

@ -73,10 +73,10 @@ export declare const actionDefDict: {
refund: { refund: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
settlePlan: { settlement: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
settlement: { settlePlan: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
ship: { ship: {

View File

@ -27,8 +27,8 @@ import { actionDefDict as offlineAccount } from "./OfflineAccount/Action";
import { actionDefDict as order } from "./Order/Action"; import { actionDefDict as order } from "./Order/Action";
import { actionDefDict as pay } from "./Pay/Action"; import { actionDefDict as pay } from "./Pay/Action";
import { actionDefDict as refund } from "./Refund/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 settlement } from "./Settlement/Action";
import { actionDefDict as settlePlan } from "./SettlePlan/Action";
import { actionDefDict as ship } from "./Ship/Action"; import { actionDefDict as ship } from "./Ship/Action";
import { actionDefDict as user } from "./User/Action"; import { actionDefDict as user } from "./User/Action";
import { actionDefDict as withdraw } from "./Withdraw/Action"; import { actionDefDict as withdraw } from "./Withdraw/Action";
@ -66,8 +66,8 @@ export const actionDefDict = {
order, order,
pay, pay,
refund, refund,
settlePlan,
settlement, settlement,
settlePlan,
ship, ship,
user, user,
withdraw, withdraw,

View File

@ -78,8 +78,8 @@ import * as BaseOfflineAccount from "./OfflineAccount/_baseSchema";
import * as BaseOrder from "./Order/_baseSchema"; import * as BaseOrder from "./Order/_baseSchema";
import * as BasePay from "./Pay/_baseSchema"; import * as BasePay from "./Pay/_baseSchema";
import * as BaseRefund from "./Refund/_baseSchema"; import * as BaseRefund from "./Refund/_baseSchema";
import * as BaseSettlePlan from "./SettlePlan/_baseSchema";
import * as BaseSettlement from "./Settlement/_baseSchema"; import * as BaseSettlement from "./Settlement/_baseSchema";
import * as BaseSettlePlan from "./SettlePlan/_baseSchema";
import * as BaseShip from "./Ship/_baseSchema"; import * as BaseShip from "./Ship/_baseSchema";
import * as BaseShipCompany from "./ShipCompany/_baseSchema"; import * as BaseShipCompany from "./ShipCompany/_baseSchema";
import * as BaseShipOrder from "./ShipOrder/_baseSchema"; import * as BaseShipOrder from "./ShipOrder/_baseSchema";
@ -5249,54 +5249,6 @@ export type Refund = {
Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>; Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>;
Operation: Refund["Create"] | Refund["Update"] | Refund["Remove"]; 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<Omit<Settlement["Schema"], "plan">>;
settlement$plan$$aggr?: AggregationResult<Omit<Settlement["Schema"], "plan">>;
};
Projection: BaseSettlePlan.OpProjection & {
order?: Order["Projection"];
settlement$plan?: OakSelection<"select", Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
settlement$plan$$aggr?: DeduceAggregation<Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
};
FilterUnit: BaseSettlePlan.OpFilter & {
order: MakeFilter<Order["FilterUnit"]>;
settlement$plan: MakeFilter<Omit<Settlement["FilterUnit"], "plan">> & SubQueryPredicateMetadata;
};
Filter: MakeFilter<SettlePlan["FilterUnit"]>;
SortAttr: Partial<BaseSettlePlan.OpSortAttr | {
order: Order["SortAttr"];
}>;
SortNode: {
$attr: SettlePlan["SortAttr"];
$direction?: "asc" | "desc";
};
Sorter: SettlePlan["SortNode"][];
Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Aggregation: DeduceAggregation<SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
CreateOperationData: FormCreateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]>)[];
}>;
CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<SettlePlan["CreateOperationData"]>>;
Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]> | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[];
}>;
Update: OakOperation<BaseSettlePlan.OpUpdateAction, SettlePlan["UpdateOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
RemoveOperationData: {};
Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"];
};
export type Settlement = { export type Settlement = {
OpSchema: BaseSettlement.OpSchema; OpSchema: BaseSettlement.OpSchema;
Action: BaseSettlement.OpAction; Action: BaseSettlement.OpAction;
@ -5351,6 +5303,54 @@ export type Settlement = {
Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>; Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>;
Operation: Settlement["Create"] | Settlement["Update"] | Settlement["Remove"]; 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<Omit<Settlement["Schema"], "plan">>;
settlement$plan$$aggr?: AggregationResult<Omit<Settlement["Schema"], "plan">>;
};
Projection: BaseSettlePlan.OpProjection & {
order?: Order["Projection"];
settlement$plan?: OakSelection<"select", Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
settlement$plan$$aggr?: DeduceAggregation<Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
};
FilterUnit: BaseSettlePlan.OpFilter & {
order: MakeFilter<Order["FilterUnit"]>;
settlement$plan: MakeFilter<Omit<Settlement["FilterUnit"], "plan">> & SubQueryPredicateMetadata;
};
Filter: MakeFilter<SettlePlan["FilterUnit"]>;
SortAttr: Partial<BaseSettlePlan.OpSortAttr | {
order: Order["SortAttr"];
}>;
SortNode: {
$attr: SettlePlan["SortAttr"];
$direction?: "asc" | "desc";
};
Sorter: SettlePlan["SortNode"][];
Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Aggregation: DeduceAggregation<SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
CreateOperationData: FormCreateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]>)[];
}>;
CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<SettlePlan["CreateOperationData"]>>;
Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]> | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[];
}>;
Update: OakOperation<BaseSettlePlan.OpUpdateAction, SettlePlan["UpdateOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
RemoveOperationData: {};
Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"];
};
export type Ship = { export type Ship = {
OpSchema: BaseShip.OpSchema; OpSchema: BaseShip.OpSchema;
Action: BaseShip.OpAction; Action: BaseShip.OpAction;
@ -6343,8 +6343,8 @@ export type EntityDict = {
order: Order; order: Order;
pay: Pay; pay: Pay;
refund: Refund; refund: Refund;
settlePlan: SettlePlan;
settlement: Settlement; settlement: Settlement;
settlePlan: SettlePlan;
ship: Ship; ship: Ship;
shipCompany: ShipCompany; shipCompany: ShipCompany;
shipOrder: ShipOrder; shipOrder: ShipOrder;

View File

@ -76,8 +76,8 @@ import { desc as offlineAccountDesc } from "./OfflineAccount/Storage";
import { desc as orderDesc } from "./Order/Storage"; import { desc as orderDesc } from "./Order/Storage";
import { desc as payDesc } from "./Pay/Storage"; import { desc as payDesc } from "./Pay/Storage";
import { desc as refundDesc } from "./Refund/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 settlementDesc } from "./Settlement/Storage";
import { desc as settlePlanDesc } from "./SettlePlan/Storage";
import { desc as shipDesc } from "./Ship/Storage"; import { desc as shipDesc } from "./Ship/Storage";
import { desc as shipCompanyDesc } from "./ShipCompany/Storage"; import { desc as shipCompanyDesc } from "./ShipCompany/Storage";
import { desc as shipOrderDesc } from "./ShipOrder/Storage"; import { desc as shipOrderDesc } from "./ShipOrder/Storage";
@ -172,8 +172,8 @@ export const storageSchema = {
order: orderDesc, order: orderDesc,
pay: payDesc, pay: payDesc,
refund: refundDesc, refund: refundDesc,
settlePlan: settlePlanDesc,
settlement: settlementDesc, settlement: settlementDesc,
settlePlan: settlePlanDesc,
ship: shipDesc, ship: shipDesc,
shipCompany: shipCompanyDesc, shipCompany: shipCompanyDesc,
shipOrder: shipOrderDesc, shipOrder: shipOrderDesc,

View File

@ -39,8 +39,8 @@ import { style as offlineAccount } from "./OfflineAccount/Style";
import { style as order } from "./Order/Style"; import { style as order } from "./Order/Style";
import { style as pay } from "./Pay/Style"; import { style as pay } from "./Pay/Style";
import { style as refund } from "./Refund/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 settlement } from "./Settlement/Style";
import { style as settlePlan } from "./SettlePlan/Style";
import { style as ship } from "./Ship/Style"; import { style as ship } from "./Ship/Style";
import { style as sysAccountOper } from "./SysAccountOper/Style"; import { style as sysAccountOper } from "./SysAccountOper/Style";
import { style as user } from "./User/Style"; import { style as user } from "./User/Style";
@ -92,8 +92,8 @@ export const styleDict = {
order, order,
pay, pay,
refund, refund,
settlePlan,
settlement, settlement,
settlePlan,
ship, ship,
sysAccountOper, sysAccountOper,
user, user,

View File

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

View File

@ -73,10 +73,10 @@ export declare const actionDefDict: {
refund: { refund: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
settlePlan: { settlement: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
settlement: { settlePlan: {
iState: import("oak-domain/lib/types").ActionDef<string, string>; iState: import("oak-domain/lib/types").ActionDef<string, string>;
}; };
ship: { ship: {

View File

@ -30,8 +30,8 @@ const Action_26 = require("./OfflineAccount/Action");
const Action_27 = require("./Order/Action"); const Action_27 = require("./Order/Action");
const Action_28 = require("./Pay/Action"); const Action_28 = require("./Pay/Action");
const Action_29 = require("./Refund/Action"); const Action_29 = require("./Refund/Action");
const Action_30 = require("./SettlePlan/Action"); const Action_30 = require("./Settlement/Action");
const Action_31 = require("./Settlement/Action"); const Action_31 = require("./SettlePlan/Action");
const Action_32 = require("./Ship/Action"); const Action_32 = require("./Ship/Action");
const Action_33 = require("./User/Action"); const Action_33 = require("./User/Action");
const Action_34 = require("./Withdraw/Action"); const Action_34 = require("./Withdraw/Action");
@ -69,8 +69,8 @@ exports.actionDefDict = {
order: Action_27.actionDefDict, order: Action_27.actionDefDict,
pay: Action_28.actionDefDict, pay: Action_28.actionDefDict,
refund: Action_29.actionDefDict, refund: Action_29.actionDefDict,
settlePlan: Action_30.actionDefDict, settlement: Action_30.actionDefDict,
settlement: Action_31.actionDefDict, settlePlan: Action_31.actionDefDict,
ship: Action_32.actionDefDict, ship: Action_32.actionDefDict,
user: Action_33.actionDefDict, user: Action_33.actionDefDict,
withdraw: Action_34.actionDefDict, withdraw: Action_34.actionDefDict,

View File

@ -78,8 +78,8 @@ import * as BaseOfflineAccount from "./OfflineAccount/_baseSchema";
import * as BaseOrder from "./Order/_baseSchema"; import * as BaseOrder from "./Order/_baseSchema";
import * as BasePay from "./Pay/_baseSchema"; import * as BasePay from "./Pay/_baseSchema";
import * as BaseRefund from "./Refund/_baseSchema"; import * as BaseRefund from "./Refund/_baseSchema";
import * as BaseSettlePlan from "./SettlePlan/_baseSchema";
import * as BaseSettlement from "./Settlement/_baseSchema"; import * as BaseSettlement from "./Settlement/_baseSchema";
import * as BaseSettlePlan from "./SettlePlan/_baseSchema";
import * as BaseShip from "./Ship/_baseSchema"; import * as BaseShip from "./Ship/_baseSchema";
import * as BaseShipCompany from "./ShipCompany/_baseSchema"; import * as BaseShipCompany from "./ShipCompany/_baseSchema";
import * as BaseShipOrder from "./ShipOrder/_baseSchema"; import * as BaseShipOrder from "./ShipOrder/_baseSchema";
@ -5249,54 +5249,6 @@ export type Refund = {
Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>; Remove: OakOperation<"remove", Refund["RemoveOperationData"], Refund["Filter"], Refund["Sorter"]>;
Operation: Refund["Create"] | Refund["Update"] | Refund["Remove"]; 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<Omit<Settlement["Schema"], "plan">>;
settlement$plan$$aggr?: AggregationResult<Omit<Settlement["Schema"], "plan">>;
};
Projection: BaseSettlePlan.OpProjection & {
order?: Order["Projection"];
settlement$plan?: OakSelection<"select", Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
settlement$plan$$aggr?: DeduceAggregation<Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
};
FilterUnit: BaseSettlePlan.OpFilter & {
order: MakeFilter<Order["FilterUnit"]>;
settlement$plan: MakeFilter<Omit<Settlement["FilterUnit"], "plan">> & SubQueryPredicateMetadata;
};
Filter: MakeFilter<SettlePlan["FilterUnit"]>;
SortAttr: Partial<BaseSettlePlan.OpSortAttr | {
order: Order["SortAttr"];
}>;
SortNode: {
$attr: SettlePlan["SortAttr"];
$direction?: "asc" | "desc";
};
Sorter: SettlePlan["SortNode"][];
Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Aggregation: DeduceAggregation<SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
CreateOperationData: FormCreateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]>)[];
}>;
CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<SettlePlan["CreateOperationData"]>>;
Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]> | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[];
}>;
Update: OakOperation<BaseSettlePlan.OpUpdateAction, SettlePlan["UpdateOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
RemoveOperationData: {};
Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"];
};
export type Settlement = { export type Settlement = {
OpSchema: BaseSettlement.OpSchema; OpSchema: BaseSettlement.OpSchema;
Action: BaseSettlement.OpAction; Action: BaseSettlement.OpAction;
@ -5351,6 +5303,54 @@ export type Settlement = {
Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>; Remove: OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"], Settlement["Sorter"]>;
Operation: Settlement["Create"] | Settlement["Update"] | Settlement["Remove"]; 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<Omit<Settlement["Schema"], "plan">>;
settlement$plan$$aggr?: AggregationResult<Omit<Settlement["Schema"], "plan">>;
};
Projection: BaseSettlePlan.OpProjection & {
order?: Order["Projection"];
settlement$plan?: OakSelection<"select", Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
settlement$plan$$aggr?: DeduceAggregation<Omit<Settlement["Projection"], "settlePlan">, Omit<Settlement["Filter"], "settlePlan">, Settlement["Sorter"]> & {
$entity: "settlement";
};
};
FilterUnit: BaseSettlePlan.OpFilter & {
order: MakeFilter<Order["FilterUnit"]>;
settlement$plan: MakeFilter<Omit<Settlement["FilterUnit"], "plan">> & SubQueryPredicateMetadata;
};
Filter: MakeFilter<SettlePlan["FilterUnit"]>;
SortAttr: Partial<BaseSettlePlan.OpSortAttr | {
order: Order["SortAttr"];
}>;
SortNode: {
$attr: SettlePlan["SortAttr"];
$direction?: "asc" | "desc";
};
Sorter: SettlePlan["SortNode"][];
Selection: OakSelection<"select", SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Aggregation: DeduceAggregation<SettlePlan["Projection"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
CreateOperationData: FormCreateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]>)[];
}>;
CreateSingle: OakOperation<"create", SettlePlan["CreateOperationData"]>;
CreateMulti: OakOperation<"create", Array<SettlePlan["CreateOperationData"]>>;
Create: SettlePlan["CreateSingle"] | SettlePlan["CreateMulti"];
UpdateOperationData: FormUpdateData<BaseSettlePlan.OpSchema & {
order?: OakOperation<"create", Order["CreateOperationData"]> | OakOperation<BaseOrder.OpUpdateAction, Order["UpdateOperationData"], Order["Filter"]> | OakOperation<"remove", Order["RemoveOperationData"], Order["Filter"]>;
settlement$plan?: (OakOperation<"create", Omit<Settlement["CreateOperationData"], "plan"> | Omit<Settlement["CreateOperationData"], "plan">[]> | OakOperation<BaseSettlement.OpUpdateAction, Omit<Settlement["UpdateOperationData"], "plan">, Settlement["Filter"]> | OakOperation<"remove", Settlement["RemoveOperationData"], Settlement["Filter"]>)[];
}>;
Update: OakOperation<BaseSettlePlan.OpUpdateAction, SettlePlan["UpdateOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
RemoveOperationData: {};
Remove: OakOperation<"remove", SettlePlan["RemoveOperationData"], SettlePlan["Filter"], SettlePlan["Sorter"]>;
Operation: SettlePlan["Create"] | SettlePlan["Update"] | SettlePlan["Remove"];
};
export type Ship = { export type Ship = {
OpSchema: BaseShip.OpSchema; OpSchema: BaseShip.OpSchema;
Action: BaseShip.OpAction; Action: BaseShip.OpAction;
@ -6343,8 +6343,8 @@ export type EntityDict = {
order: Order; order: Order;
pay: Pay; pay: Pay;
refund: Refund; refund: Refund;
settlePlan: SettlePlan;
settlement: Settlement; settlement: Settlement;
settlePlan: SettlePlan;
ship: Ship; ship: Ship;
shipCompany: ShipCompany; shipCompany: ShipCompany;
shipOrder: ShipOrder; shipOrder: ShipOrder;

View File

@ -79,8 +79,8 @@ const Storage_75 = require("./OfflineAccount/Storage");
const Storage_76 = require("./Order/Storage"); const Storage_76 = require("./Order/Storage");
const Storage_77 = require("./Pay/Storage"); const Storage_77 = require("./Pay/Storage");
const Storage_78 = require("./Refund/Storage"); const Storage_78 = require("./Refund/Storage");
const Storage_79 = require("./SettlePlan/Storage"); const Storage_79 = require("./Settlement/Storage");
const Storage_80 = require("./Settlement/Storage"); const Storage_80 = require("./SettlePlan/Storage");
const Storage_81 = require("./Ship/Storage"); const Storage_81 = require("./Ship/Storage");
const Storage_82 = require("./ShipCompany/Storage"); const Storage_82 = require("./ShipCompany/Storage");
const Storage_83 = require("./ShipOrder/Storage"); const Storage_83 = require("./ShipOrder/Storage");
@ -175,8 +175,8 @@ exports.storageSchema = {
order: Storage_76.desc, order: Storage_76.desc,
pay: Storage_77.desc, pay: Storage_77.desc,
refund: Storage_78.desc, refund: Storage_78.desc,
settlePlan: Storage_79.desc, settlement: Storage_79.desc,
settlement: Storage_80.desc, settlePlan: Storage_80.desc,
ship: Storage_81.desc, ship: Storage_81.desc,
shipCompany: Storage_82.desc, shipCompany: Storage_82.desc,
shipOrder: Storage_83.desc, shipOrder: Storage_83.desc,

View File

@ -42,8 +42,8 @@ const Style_38 = require("./OfflineAccount/Style");
const Style_39 = require("./Order/Style"); const Style_39 = require("./Order/Style");
const Style_40 = require("./Pay/Style"); const Style_40 = require("./Pay/Style");
const Style_41 = require("./Refund/Style"); const Style_41 = require("./Refund/Style");
const Style_42 = require("./SettlePlan/Style"); const Style_42 = require("./Settlement/Style");
const Style_43 = require("./Settlement/Style"); const Style_43 = require("./SettlePlan/Style");
const Style_44 = require("./Ship/Style"); const Style_44 = require("./Ship/Style");
const Style_45 = require("./SysAccountOper/Style"); const Style_45 = require("./SysAccountOper/Style");
const Style_46 = require("./User/Style"); const Style_46 = require("./User/Style");
@ -95,8 +95,8 @@ exports.styleDict = {
order: Style_39.style, order: Style_39.style,
pay: Style_40.style, pay: Style_40.style,
refund: Style_41.style, refund: Style_41.style,
settlePlan: Style_42.style, settlement: Style_42.style,
settlement: Style_43.style, settlePlan: Style_43.style,
ship: Style_44.style, ship: Style_44.style,
sysAccountOper: Style_45.style, sysAccountOper: Style_45.style,
user: Style_46.style, user: Style_46.style,

View File

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