@etsoo/smarterp-core 1.1.64 → 1.1.66

package/__tests__/OrgApi.ts

@@ -3,40 +3,40 @@ import { isLocalTest, TestApp } from "./app/TestApp";
 import { EntityStatus } from "@etsoo/appscript";
 import { OrgApi } from "../src/OrgApi";
 import { OrgCreateRQ } from "../src/rq/org/OrgCreateRQ";
-import { CoreApp } from "../src";
+import { CoreApp, PeriodReportData } from "../src";
 
 const app = new TestApp();
 await app.changeCulture(app.settings.cultures[0]);
 
 test("Test SysResourceKeyPrefix", () => {
-  const source = [
+  const source: PeriodReportData[] = [
     {
       period: 202601,
-      qty: 236
+      value: 236
     },
     {
       period: 202602,
-      qty: 99
+      value: 99
     },
     {
       period: 202603,
-      qty: 120
+      value: 120
     },
     {
       period: 202604,
-      qty: 199
+      value: 199
     },
     {
       period: 202605,
-      qty: 230
+      value: 230
     },
     {
       period: 202606,
-      qty: 3
+      value: 3
     },
     {
       period: 202505,
-      qty: 215
+      value: 215
     }
   ];
 

package/lib/cjs/CoreApp.d.ts

@@ -10,7 +10,8 @@ import { ListType, ListType1 } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
-import { OrgReportData } from "./dto/org/OrgReportData";
+import { ReportApi } from "./ReportApi";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
 type AppData = {
     id: number;
     appId?: number;
@@ -50,6 +51,10 @@ export interface ICoreApp {
      * Public API
      */
     readonly publicApi: PublicApi;
+    /**
+     * Report API
+     */
+    readonly reportApi: ReportApi;
     /**
      * User API
      */
@@ -131,7 +136,7 @@ export interface ICoreApp {
      * @param year Year to calculate
      * @returns Result
      */
-    getReportData(data: OrgReportData[], year: number): number[];
+    getReportData(data: PeriodReportData[], year: number): number[];
     /**
      * Transform report data for chart
      * 转换报告数据用于图表
@@ -140,7 +145,7 @@ export interface ICoreApp {
      * @param year Year to calculate, default is current year
      * @returns Transformed report data
      */
-    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
         labels: string[];
         currentYearData: number[];
         lastYearData: number[];
@@ -195,6 +200,12 @@ export declare class CoreApp implements ICoreApp {
      * 公共接口
      */
     get publicApi(): PublicApi;
+    private _reportApi?;
+    /**
+     * Report API
+     * 报告接口
+     */
+    get reportApi(): ReportApi;
     private _userApi?;
     /**
      * User API
@@ -285,7 +296,7 @@ export declare class CoreApp implements ICoreApp {
      * @param year Year to calculate
      * @returns Result
      */
-    getReportData(data: OrgReportData[], year: number): number[];
+    getReportData(data: PeriodReportData[], year: number): number[];
     /**
      * Transform report data for chart
      * 转换报告数据用于图表
@@ -294,7 +305,7 @@ export declare class CoreApp implements ICoreApp {
      * @param year Year to calculate, default is current year
      * @returns Transformed report data
      */
-    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+    transformReportData(data: PeriodReportData[], hasLastYear?: boolean, year?: number): {
         labels: string[];
         currentYearData: number[];
         lastYearData: number[];

package/lib/cjs/CoreApp.js

@@ -12,6 +12,7 @@ const shared_1 = require("@etsoo/shared");
 const CoreApiService_1 = require("./dto/org/CoreApiService");
 const DocumentApi_1 = require("./DocumentApi");
 const DocumentKind_1 = require("./dto/document/DocumentKind");
+const ReportApi_1 = require("./ReportApi");
 /**
  * Core application
  * 核心应用程序
@@ -75,6 +76,14 @@ class CoreApp {
     get publicApi() {
         return (this._publicApi ??= new PublicApi_1.PublicApi(this.app, this.api));
     }
+    _reportApi;
+    /**
+     * Report API
+     * 报告接口
+     */
+    get reportApi() {
+        return (this._reportApi ??= new ReportApi_1.ReportApi(this.app, this.api));
+    }
     _userApi;
     /**
      * User API
@@ -232,7 +241,7 @@ class CoreApp {
         const items = [];
         for (let i = start; i <= end; i++) {
             const item = data.find((d) => d.period === i);
-            items.push(item ? ("qty" in item ? item.qty : item.amount) : 0);
+            items.push(item?.value ?? 0);
         }
         return items;
     }

package/lib/cjs/OrgApi.d.ts

@@ -26,8 +26,6 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
-import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
-import { OrgReportData } from "./dto/org/OrgReportData";
 /**
  * Organization API
  * 机构接口
@@ -249,11 +247,4 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     updateResourceRead(id: number, payload?: IApiPayload<OrgUpdateResourceReadData>): Promise<OrgUpdateResourceReadData | undefined>;
-    /**
-     * Get usage report
-     * @param rq Request data
-     * @param payload Payload
-     * @returns Result
-     */
-    usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>): Promise<OrgReportData[] | undefined>;
 }

package/lib/cjs/OrgApi.js

@@ -305,14 +305,5 @@ class OrgApi extends appscript_1.EntityApi {
     updateResourceRead(id, payload) {
         return this.api.get(`${this.flag}/UpdateResourceRead/${id}`, undefined, payload);
     }
-    /**
-     * Get usage report
-     * @param rq Request data
-     * @param payload Payload
-     * @returns Result
-     */
-    usageReport(rq, payload) {
-        return this.api.post(`${this.flag}/UsageReport`, rq, payload);
-    }
 }
 exports.OrgApi = OrgApi;

package/lib/cjs/PublicApi.d.ts

@@ -127,11 +127,10 @@ export declare class PublicApi extends BaseApi {
     /**
      * Read member invitation
      * @param id Id
-     * @param code Hashed code
      * @param payload Payload
      * @returns Result
      */
-    readInvitation(id: string, code: string, payload?: IApiPayload<MemberInvitationDto>): Promise<MemberInvitationDto | undefined>;
+    readInvitation(id: string, payload?: IApiPayload<MemberInvitationDto>): Promise<MemberInvitationDto | undefined>;
     /**
      *
      * Get all repeat options

package/lib/cjs/PublicApi.js

@@ -196,12 +196,11 @@ class PublicApi extends appscript_1.BaseApi {
     /**
      * Read member invitation
      * @param id Id
-     * @param code Hashed code
      * @param payload Payload
      * @returns Result
      */
-    readInvitation(id, code, payload) {
-        return this.api.get(`Public/ReadInvitation/${id}?code=${code}`, undefined, payload);
+    readInvitation(id, payload) {
+        return this.api.get(`Public/ReadInvitation/${id}`, undefined, payload);
     }
     /**
      *

package/lib/cjs/ReportApi.d.ts

@@ -0,0 +1,62 @@
+import { BaseApi, IApi, IApiPayload, IApp } from "@etsoo/appscript";
+import { OrgUsageReportRQ } from "./rq/report/OrgUsageReportRQ";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
+import { OrderDailyReportData } from "./dto/report/OrderDailyReportData";
+import { OrderDailyReportRQ } from "./rq/report/OrderDailyReportRQ";
+import { OrderMonthlyReportRQ } from "./rq/report/OrderMonthlyReportRQ";
+import { OrderMonthlyReportData } from "./dto/report/OrderMonthlyReportData";
+import { OrderDailyReportQueryRQ } from "./rq/report/OrderDailyReportQueryRQ";
+import { OrderDailyReportQueryData } from "./dto/report/OrderDailyReportQueryData";
+import { OrderMonthlyReportQueryData } from "./dto/report/OrderMonthlyReportQueryData";
+import { OrderMonthlyReportQueryRQ } from "./rq/report/OrderMonthlyReportQueryRQ";
+/**
+ * Report API
+ */
+export declare class ReportApi extends BaseApi {
+    /**
+     * Constructor
+     * @param app Application
+     * @param api API
+     */
+    constructor(app: IApp, api?: IApi);
+    /**
+     * Order daily report
+     * 订单日报表
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderDailyReport(rq: OrderDailyReportRQ, payload?: IApiPayload<OrderDailyReportData[]>): Promise<OrderDailyReportData[] | undefined>;
+    /**
+     * Order daily report query
+     * 订单日报表查询
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderDailyReportQuery(rq: OrderDailyReportQueryRQ, payload?: IApiPayload<OrderDailyReportQueryData[]>): Promise<OrderDailyReportQueryData[] | undefined>;
+    /**
+     * Order monthly report
+     * 订单月报表
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderMonthlyReport(rq: OrderMonthlyReportRQ, payload?: IApiPayload<OrderMonthlyReportData[]>): Promise<OrderMonthlyReportData[] | undefined>;
+    /**
+     * Order monthly report query
+     * 订单月报表查询
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderMonthlyReportQuery(rq: OrderMonthlyReportQueryRQ, payload?: IApiPayload<OrderMonthlyReportQueryData[]>): Promise<OrderMonthlyReportQueryData[] | undefined>;
+    /**
+     * Get usage report
+     * 获取使用报告
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<PeriodReportData[]>): Promise<PeriodReportData[] | undefined>;
+}

package/lib/cjs/ReportApi.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReportApi = void 0;
+const appscript_1 = require("@etsoo/appscript");
+/**
+ * Report API
+ */
+class ReportApi extends appscript_1.BaseApi {
+    /**
+     * Constructor
+     * @param app Application
+     * @param api API
+     */
+    constructor(app, api = app.api) {
+        super(app, api);
+    }
+    /**
+     * Order daily report
+     * 订单日报表
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderDailyReport(rq, payload) {
+        return this.api.post("Report/OrderDailyReport", rq, payload);
+    }
+    /**
+     * Order daily report query
+     * 订单日报表查询
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderDailyReportQuery(rq, payload) {
+        return this.api.post("Report/OrderDailyReportQuery", rq, payload);
+    }
+    /**
+     * Order monthly report
+     * 订单月报表
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderMonthlyReport(rq, payload) {
+        return this.api.post("Report/OrderMonthlyReport", rq, payload);
+    }
+    /**
+     * Order monthly report query
+     * 订单月报表查询
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    orderMonthlyReportQuery(rq, payload) {
+        return this.api.post("Report/OrderMonthlyReportQuery", rq, payload);
+    }
+    /**
+     * Get usage report
+     * 获取使用报告
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq, payload) {
+        return this.api.post("Report/UsageReport", rq, payload);
+    }
+}
+exports.ReportApi = ReportApi;

package/lib/cjs/dto/report/OrderDailyReportData.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Order daily report data
+ * 订单日报表数据
+ */
+export type OrderDailyReportData = {
+    /**
+     * Period
+     * 区间
+     */
+    Period: string;
+    /**
+     * Order Items
+     * 订单项目
+     */
+    Items: number;
+    /**
+     * Amount
+     * 金额
+     */
+    Amount: number;
+    /**
+     * Customers
+     * 订单
+     */
+    Customers: number;
+};

package/lib/cjs/dto/report/OrderDailyReportQueryData.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Order daily report query data
+ * 订单日报表查询数据
+ */
+export type OrderDailyReportQueryData = {
+    /**
+     * Id
+     * 编号
+     */
+    id: number;
+    /**
+     * Period
+     * 区间
+     */
+    period: string;
+    /**
+     * Order Items
+     * 订单项目
+     */
+    items: number;
+    /**
+     * Amount
+     * 金额
+     */
+    amount: number;
+    /**
+     * Paid amount
+     * 已付款金额
+     */
+    paidAmount: number;
+    /**
+     * Discount
+     * 折扣
+     */
+    discount: number;
+    /**
+     * Line discount
+     * 行折扣
+     */
+    lineDiscount: number;
+    /**
+     * Approved discount
+     * 授权折扣
+     */
+    approvedDiscount: number;
+    /**
+     * Qty
+     * 数量
+     */
+    qty: number;
+    /**
+     * Customers
+     * 订单
+     */
+    customers: number;
+};

package/lib/cjs/dto/report/OrderMonthlyReportData.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Order monthly report data
+ * 订单月报表数据
+ */
+export type OrderMonthlyReportData = {
+    /**
+     * Period
+     * 区间
+     */
+    Period: number;
+    /**
+     * Order Items
+     * 订单项目
+     */
+    Items: number;
+    /**
+     * Amount
+     * 金额
+     */
+    Amount: number;
+    /**
+     * Customers
+     * 订单
+     */
+    Customers: number;
+};

package/lib/cjs/dto/report/OrderMonthlyReportData.js

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

package/lib/cjs/dto/report/OrderMonthlyReportQueryData.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Order monthly report query data
+ * 订单月报表查询数据
+ */
+export type OrderMonthlyReportQueryData = {
+    /**
+     * Id
+     * 编号
+     */
+    id: number;
+    /**
+     * Period
+     * 区间
+     */
+    period: number;
+    /**
+     * Order Items
+     * 订单项目
+     */
+    items: number;
+    /**
+     * Amount
+     * 金额
+     */
+    amount: number;
+    /**
+     * Paid amount
+     * 已付款金额
+     */
+    paidAmount: number;
+    /**
+     * Discount
+     * 折扣
+     */
+    discount: number;
+    /**
+     * Line discount
+     * 行折扣
+     */
+    lineDiscount: number;
+    /**
+     * Approved discount
+     * 授权折扣
+     */
+    approvedDiscount: number;
+    /**
+     * Qty
+     * 数量
+     */
+    qty: number;
+    /**
+     * Customers
+     * 订单
+     */
+    customers: number;
+};

package/lib/cjs/dto/report/OrderMonthlyReportQueryData.js

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

package/lib/cjs/dto/report/PeriodReportData.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Period report data
+ * 周期报表数据
+ */
+export type PeriodReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Value
+     * 值
+     */
+    value: number;
+};

package/lib/cjs/dto/report/PeriodReportData.js

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

package/lib/cjs/dto/report/TitleReportData.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Title report data
+ * 标题报表数据
+ */
+export type TitleReportData = {
+    /**
+     * Title
+     * 标题
+     */
+    title: string;
+    /**
+     * Value
+     * 值
+     */
+    value: number;
+};

package/lib/cjs/dto/report/TitleReportData.js

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

package/lib/cjs/index.d.ts

@@ -22,7 +22,6 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
-export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -39,6 +38,12 @@ export * from "./dto/user/AuditHistoryDto";
 export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
+export * from "./dto/report/OrderDailyReportData";
+export * from "./dto/report/OrderDailyReportQueryData";
+export * from "./dto/report/OrderMonthlyReportData";
+export * from "./dto/report/OrderMonthlyReportQueryData";
+export * from "./dto/report/PeriodReportData";
+export * from "./dto/report/TitleReportData";
 export * from "./i18n/CoreCulture";
 export * from "./rq/app/AppBuyNewRQ";
 export * from "./rq/app/AppBuyRQ";
@@ -71,7 +76,6 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
-export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";
@@ -84,6 +88,11 @@ export * from "./rq/public/PlaceQueryRQ";
 export * from "./rq/public/TimeZoneRQ";
 export * from "./rq/user/AuditHistoryRQ";
 export * from "./rq/user/UserUpdateRQ";
+export * from "./rq/report/OrderDailyReportQueryRQ";
+export * from "./rq/report/OrderDailyReportRQ";
+export * from "./rq/report/OrderMonthlyReportQueryRQ";
+export * from "./rq/report/OrderMonthlyReportRQ";
+export * from "./rq/report/OrgUsageReportRQ";
 export * from "./AppApi";
 export * from "./AuthCodeApi";
 export * from "./CoreApp";

package/lib/cjs/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./dto/member/MemberListDto"), exports);
 __exportStar(require("./dto/member/MemberQueryDto"), exports);
 __exportStar(require("./dto/member/MemberReadDto"), exports);
 __exportStar(require("./dto/member/MemberUpdateReadDto"), exports);
+// Org
 __exportStar(require("./dto/org/CoreApiService"), exports);
 __exportStar(require("./dto/org/OrgDownloadKind"), exports);
 __exportStar(require("./dto/org/OrgGetMyData"), exports);
@@ -39,11 +40,11 @@ __exportStar(require("./dto/org/OrgQueryApiData"), exports);
 __exportStar(require("./dto/org/OrgQueryDto"), exports);
 __exportStar(require("./dto/org/OrgQueryResourceData"), exports);
 __exportStar(require("./dto/org/OrgReadDto"), exports);
-__exportStar(require("./dto/org/OrgReportData"), exports);
 __exportStar(require("./dto/org/OrgResourceItem"), exports);
 __exportStar(require("./dto/org/OrgUpdateApiReadDto"), exports);
 __exportStar(require("./dto/org/OrgUpdateReadDto"), exports);
 __exportStar(require("./dto/org/OrgUpdateResourceReadData"), exports);
+// Public
 __exportStar(require("./dto/public/AvatarState"), exports);
 __exportStar(require("./dto/public/ChinaPinData"), exports);
 __exportStar(require("./dto/public/CurrencyItem"), exports);
@@ -56,6 +57,13 @@ __exportStar(require("./dto/user/AuditHistoryDto"), exports);
 __exportStar(require("./dto/user/DeviceListDto"), exports);
 __exportStar(require("./dto/user/UserIdentifierData"), exports);
 __exportStar(require("./dto/user/UserUpdateReadDto"), exports);
+// Report
+__exportStar(require("./dto/report/OrderDailyReportData"), exports);
+__exportStar(require("./dto/report/OrderDailyReportQueryData"), exports);
+__exportStar(require("./dto/report/OrderMonthlyReportData"), exports);
+__exportStar(require("./dto/report/OrderMonthlyReportQueryData"), exports);
+__exportStar(require("./dto/report/PeriodReportData"), exports);
+__exportStar(require("./dto/report/TitleReportData"), exports);
 // i18n
 __exportStar(require("./i18n/CoreCulture"), exports);
 // RQ
@@ -80,6 +88,7 @@ __exportStar(require("./rq/member/MemberInviteRQ"), exports);
 __exportStar(require("./rq/member/MemberListRQ"), exports);
 __exportStar(require("./rq/member/MemberQueryRQ"), exports);
 __exportStar(require("./rq/member/MemberUpdateRQ"), exports);
+// Org
 __exportStar(require("./rq/org/OrgCreateApiRQ"), exports);
 __exportStar(require("./rq/org/OrgCreateResourceRQ"), exports);
 __exportStar(require("./rq/org/OrgCreateRQ"), exports);
@@ -90,11 +99,11 @@ __exportStar(require("./rq/org/OrgQueryApiRQ"), exports);
 __exportStar(require("./rq/org/OrgQueryResourceRQ"), exports);
 __exportStar(require("./rq/org/OrgQueryRQ"), exports);
 __exportStar(require("./rq/org/OrgUpdateApiRQ"), exports);
-__exportStar(require("./rq/org/OrgUsageReportRQ"), exports);
 __exportStar(require("./rq/org/OrgUpdateRQ"), exports);
 __exportStar(require("./rq/org/SendEmailMessage"), exports);
 __exportStar(require("./rq/org/SendProfileEmailRQ"), exports);
 __exportStar(require("./rq/org/SendSMSMessage"), exports);
+// Public
 __exportStar(require("./rq/public/AcceptInvitationRQ"), exports);
 __exportStar(require("./rq/public/CreateBarcodeRQ"), exports);
 __exportStar(require("./rq/public/ParseNameRQ"), exports);
@@ -103,6 +112,12 @@ __exportStar(require("./rq/public/PlaceQueryRQ"), exports);
 __exportStar(require("./rq/public/TimeZoneRQ"), exports);
 __exportStar(require("./rq/user/AuditHistoryRQ"), exports);
 __exportStar(require("./rq/user/UserUpdateRQ"), exports);
+// Report
+__exportStar(require("./rq/report/OrderDailyReportQueryRQ"), exports);
+__exportStar(require("./rq/report/OrderDailyReportRQ"), exports);
+__exportStar(require("./rq/report/OrderMonthlyReportQueryRQ"), exports);
+__exportStar(require("./rq/report/OrderMonthlyReportRQ"), exports);
+__exportStar(require("./rq/report/OrgUsageReportRQ"), exports);
 // APIs
 __exportStar(require("./AppApi"), exports);
 __exportStar(require("./AuthCodeApi"), exports);