Merge remote-tracking branch 'origin/statistics'

# Conflicts:
#	src/client/models/DealSchema.ts

src/client/models/DealGeneralInfoSchema.ts

@@ -2,6 +2,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+import type { UserSchema } from './UserSchema';
 export type DealGeneralInfoSchema = {
     name: string;
     isDeleted: boolean;
@@ -10,5 +11,6 @@ export type DealGeneralInfoSchema = {
     shippingWarehouse?: (string | null);
     deliveryDate?: (string | null);
     receivingSlotDate?: (string | null);
+    manager?: (UserSchema | null);
 };
 

src/client/models/DealSchema.ts

@@ -4,12 +4,14 @@
 /* eslint-disable */
 import type { ClientSchema } from './ClientSchema';
 import type { DealBillRequestSchema } from './DealBillRequestSchema';
-import type { DealGroupSchema } from './DealGroupSchema';
 import type { DealProductSchema } from './DealProductSchema';
 import type { DealServiceSchema } from './DealServiceSchema';
 import type { DealStatusHistorySchema } from './DealStatusHistorySchema';
 import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema';
 import type { ShippingWarehouseSchema } from './ShippingWarehouseSchema';
+import type { UserSchema } from './UserSchema';
+import type { DealGroupSchema } from './DealGroupSchema';
+
 export type DealSchema = {
     id: number;
     name: string;
@@ -28,6 +30,8 @@ export type DealSchema = {
     billRequest?: (DealBillRequestSchema | null);
     category?: (ServicePriceCategorySchema | null);
     group?: (DealGroupSchema | null);
+    manager?: (UserSchema | null);
+
     deliveryDate?: (string | null);
     receivingSlotDate?: (string | null);
 };

src/client/models/GetProfitChartDataRequest.ts

@@ -0,0 +1,11 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type GetProfitChartDataRequest = {
+    dateRange: any[];
+    clientId: number;
+    baseMarketplaceKey: string;
+    dealStatusId: number;
+};
+

src/client/models/GetProfitChartDataResponse.ts

@@ -0,0 +1,9 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ProfitChartDataItem } from './ProfitChartDataItem';
+export type GetProfitChartDataResponse = {
+    data: Array<ProfitChartDataItem>;
+};
+

src/client/models/GetProfitTableDataRequest.ts

@@ -0,0 +1,10 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ProfitTableGroupBy } from './ProfitTableGroupBy';
+export type GetProfitTableDataRequest = {
+    dateRange: any[];
+    groupTableBy: ProfitTableGroupBy;
+};
+

src/client/models/GetProfitTableDataResponse.ts

@@ -0,0 +1,9 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { ProfitTableDataItem } from './ProfitTableDataItem';
+export type GetProfitTableDataResponse = {
+    data: Array<ProfitTableDataItem>;
+};
+

src/client/models/ProfitChartDataItem.ts

@@ -0,0 +1,11 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type ProfitChartDataItem = {
+    date: string;
+    revenue: number;
+    profit: number;
+    dealsCount: number;
+};
+

src/client/models/ProfitTableDataItem.ts

@@ -0,0 +1,11 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type ProfitTableDataItem = {
+    groupedValue: (string | number);
+    revenue: number;
+    profit: number;
+    dealsCount: number;
+};
+

src/client/models/ProfitTableGroupBy.ts

@@ -0,0 +1,5 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+export type ProfitTableGroupBy = 0 | 1 | 2 | 3 | 4;