@freedom_sky/feige-lib 5.9.0 → 5.11.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Order, Process, Content, Checkout, Task } from './interfaces/order/order.interface';
+import { Order } from './interfaces/order/order.interface';
+import { Process, Content, Checkout, Task } from './interfaces/order/baseOrder.interface';
 import { BuffetCombosItems, Store } from './interfaces/store/store.interface';
 import { VisitTask } from './interfaces/visit-task/visit-task.interface';
 import { User, UserSafe, CertificatePath } from './interfaces/user/user.interface';
@@ -29,6 +30,7 @@ export * from './interfaces/store/store.interface';
 export * from './interfaces/common/language.interface';
 export * from './interfaces/store/subscription.interface';
 export * from './interfaces/store/dish.interface';
+export * from './interfaces/order';
 export { PayCompanyEnum } from './enum/pay-company.enum';
 import * as moment from 'moment';
 import Big from 'big.js';

package/dist/index.js

@@ -28,6 +28,7 @@ __export(require("./enum/from.enum"));
 __export(require("./enum/role.enum"));
 __export(require("./enum/continent.enum"));
 __export(require("./announcement/enum/announcement.enum"));
+__export(require("./interfaces/order"));
 var pay_company_enum_1 = require("./enum/pay-company.enum");
 exports.PayCompanyEnum = pay_company_enum_1.PayCompanyEnum;
 var moment = require("moment");

package/dist/interfaces/order/baseOrder.interface.d.ts

@@ -0,0 +1,83 @@
+import { DishSnapshot } from '../store/dishSnapshot.interface';
+import { PrintStatusEnum } from '../../enum/printer.enum';
+import { OrderTypeEnum } from '../../enum/order.enum';
+import { TaxTypeEnum } from '../../enum/tax.enum';
+export interface BaseOrder {
+    readonly _id: string;
+    readonly serialOrderId: string;
+    readonly type: OrderTypeEnum;
+    readonly note?: string;
+    readonly merchantNote?: string;
+    readonly printerPrinted: string[];
+    readonly kdsPrinted: string[];
+    readonly printStatus: PrintStatusEnum;
+    readonly content: Content[];
+    readonly storeId: string;
+    readonly clientId: string;
+    readonly date: Date | string;
+    readonly autoCleanTime?: Date | string;
+    readonly status: string;
+    readonly checkoutFirst: boolean;
+    readonly salesmanId: string;
+    readonly __v: number;
+    readonly process?: Process[];
+    readonly checkout?: Checkout[];
+    readonly payed: boolean;
+    readonly retreated?: boolean;
+    readonly noTax?: boolean;
+    readonly taxType?: TaxTypeEnum;
+    readonly priceHaveTaxBindOrderTaxes?: {
+        name: string;
+        rate: number;
+    }[];
+    readonly taxes?: {
+        name: string;
+        volume: number;
+    }[];
+}
+export interface Content {
+    _id?: string;
+    dishSnapshot: DishSnapshot;
+    count: number;
+    weight?: number;
+    delivering?: number;
+    finished?: number;
+    retreated?: number;
+    retreatReason?: string;
+    date?: Date | string;
+}
+export interface Task {
+    _id: string;
+    type: string;
+    date: Date | string;
+    dishGroupId?: string;
+    status: string;
+    operatorId?: string;
+    outletNum?: number;
+    count?: number;
+    callReason?: string;
+    content?: Content[];
+    valet?: boolean;
+    printerPrinted: string[];
+    kdsPrinted: string[];
+    printStatus: PrintStatusEnum;
+    clientId: string;
+}
+export interface Process {
+    readonly _id?: string;
+    readonly type: string;
+    readonly value: number;
+    readonly volume?: number;
+}
+export interface Checkout {
+    readonly _id?: string;
+    readonly type: string;
+    readonly customType?: string;
+    readonly amount: number;
+    readonly realCash?: number;
+    readonly retreated?: boolean;
+    readonly date?: Date | string;
+    readonly payRecordId?: string;
+    readonly memberTransactionId?: string;
+    readonly operatorId?: string;
+}

package/dist/interfaces/order/baseOrder.interface.js

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

package/dist/interfaces/order/buffetOrder.interface.d.ts

@@ -0,0 +1,13 @@
+import { TableOrder } from './tableOrder.interface';
+import { BuffetCombosItems } from '../store/store.interface';
+export interface BuffetOrder extends TableOrder {
+    readonly buffet: {
+        snapshot: BuffetCombosItems;
+        taxes: {
+            name: string;
+            rate: number;
+        }[];
+    };
+    readonly adultNum: number;
+    readonly childNum: number;
+}

package/dist/interfaces/order/buffetOrder.interface.js

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

package/dist/interfaces/order/deliveryOrder.interface.d.ts

@@ -0,0 +1,9 @@
+import { BaseOrder } from './baseOrder.interface';
+export interface DeliveryOrder extends BaseOrder {
+    readonly selfPickUp: false;
+    readonly phoneNum: string;
+    readonly deliveryFee: number;
+    readonly address: string;
+    readonly nickName: string;
+    readonly reserveTime?: Date;
+}

package/dist/interfaces/order/deliveryOrder.interface.js

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

package/dist/interfaces/order/index.d.ts

@@ -0,0 +1,7 @@
+export * from './deliveryOrder.interface';
+export * from './pickupOrder.interface';
+export * from './order.interface';
+export * from './buffetOrder.interface';
+export * from './tableOrder.interface';
+export * from './serialOrder.interface';
+export * from './baseOrder.interface';

package/dist/interfaces/order/index.js

@@ -0,0 +1,6 @@
+"use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./order.interface"));

package/dist/interfaces/order/order.interface.d.ts

@@ -1,7 +1,14 @@
-import { DishSnapshot } from '../store/dishSnapshot.interface';
 import { PrintStatusEnum } from '../../enum/printer.enum';
-import { OrderTypeEnum } from '../../enum/order.enum';
-import { TaxTypeEnum } from '../../enum/tax.enum';
+import { DeliveryOrder } from './deliveryOrder.interface';
+import { PickUpOrder } from './pickupOrder.interface';
+import { TableOrder } from './tableOrder.interface';
+import { BuffetOrder } from './buffetOrder.interface';
+import { SerialOrder } from './serialOrder.interface';
+import { OrderTypeEnum, TaxTypeEnum } from '../../index';
+import { Content } from './baseOrder.interface';
+import { Task } from './baseOrder.interface';
+import { Process } from './baseOrder.interface';
+import { Checkout } from './baseOrder.interface';
 import { BuffetCombosItems } from '../store/store.interface';
 export interface Order {
     readonly _id: string;
@@ -37,6 +44,7 @@ export interface Order {
     readonly taxType?: TaxTypeEnum;
     readonly reserveTime?: Date;
     readonly selfPickUp?: boolean;
+    readonly selfPickUpUseDeliveryPrice?: boolean;
     readonly pack?: boolean;
     readonly priceHaveTaxBindOrderTaxes?: {
         name: string;
@@ -56,49 +64,12 @@ export interface Order {
     readonly adultNum?: number;
     readonly childNum?: number;
 }
-export interface Content {
-    _id?: string;
-    dishSnapshot: DishSnapshot;
-    count: number;
-    weight?: number;
-    delivering?: number;
-    finished?: number;
-    retreated?: number;
-    retreatReason?: string;
-    date?: Date | string;
-}
-export interface Task {
-    _id: string;
-    type: string;
-    date: Date | string;
-    dishGroupId?: string;
-    status: string;
-    operatorId?: string;
-    outletNum?: number;
-    count?: number;
-    callReason?: string;
-    content?: Content[];
-    valet?: boolean;
-    printerPrinted: string[];
-    kdsPrinted: string[];
-    printStatus: PrintStatusEnum;
-    clientId: string;
-}
-export interface Process {
-    readonly _id?: string;
-    readonly type: string;
-    readonly value: number;
-    readonly volume?: number;
-}
-export interface Checkout {
-    readonly _id?: string;
-    readonly type: string;
-    readonly customType?: string;
-    readonly amount: number;
-    readonly realCash?: number;
-    readonly retreated?: boolean;
-    readonly date?: Date | string;
-    readonly payRecordId?: string;
-    readonly memberTransactionId?: string;
-    readonly operatorId?: string;
-}
+export declare type AnyOrder = TableOrder | BuffetOrder | SerialOrder | DeliveryOrder | PickUpOrder;
+/**
+ * @param order
+ */
+export declare function isTableOrder(order: Order): order is TableOrder;
+/**
+ * @param order
+ */
+export declare function isBuffetOrder(order: Order): order is TableOrder;

package/dist/interfaces/order/order.interface.js

@@ -1,2 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var index_1 = require("../../index");
+/**
+ * @param order
+ */
+function isTableOrder(order) {
+    return order.type === index_1.OrderTypeEnum.Table;
+}
+exports.isTableOrder = isTableOrder;
+/**
+ * @param order
+ */
+function isBuffetOrder(order) {
+    return order.type === index_1.OrderTypeEnum.Buffet;
+}
+exports.isBuffetOrder = isBuffetOrder;

package/dist/interfaces/order/pickupOrder.interface copy.d.ts

@@ -0,0 +1,8 @@
+import { BaseOrder } from './baseOrder.interface';
+export interface PickUpOrder extends BaseOrder {
+    readonly selfPickUp: true;
+    readonly phoneNum: string;
+    readonly nickName: string;
+    readonly reserveTime?: Date;
+    readonly selfPickUpUseDeliveryPrice: boolean;
+}

package/dist/interfaces/order/pickupOrder.interface copy.js

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

package/dist/interfaces/order/pickupOrder.interface.d.ts

@@ -0,0 +1,8 @@
+import { BaseOrder } from './baseOrder.interface';
+export interface PickUpOrder extends BaseOrder {
+    readonly selfPickUp: true;
+    readonly phoneNum: string;
+    readonly nickName: string;
+    readonly reserveTime?: Date;
+    readonly selfPickUpUseDeliveryPrice: boolean;
+}

package/dist/interfaces/order/pickupOrder.interface.js

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

package/dist/interfaces/order/serialOrder.interface.d.ts

@@ -0,0 +1,4 @@
+import { BaseOrder } from './baseOrder.interface';
+export interface SerialOrder extends BaseOrder {
+    readonly serialNum: string;
+}

package/dist/interfaces/order/serialOrder.interface.js

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

package/dist/interfaces/order/seriesOrder.interface.d.ts

@@ -0,0 +1,4 @@
+import { BaseOrder } from './baseOrder.interface';
+export interface TableOrder extends BaseOrder {
+    readonly serialNum: string;
+}

package/dist/interfaces/order/seriesOrder.interface.js

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

package/dist/interfaces/order/tableOrder.interface copy.d.ts

@@ -0,0 +1,6 @@
+import { BaseOrder } from './baseOrder.interface';
+import { Task } from './order.interface';
+export interface TableOrder extends BaseOrder {
+    readonly tableNum: string;
+    readonly tasks: Task[];
+}

package/dist/interfaces/order/tableOrder.interface copy.js

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

package/dist/interfaces/order/tableOrder.interface.d.ts

@@ -0,0 +1,7 @@
+import { BaseOrder } from './baseOrder.interface';
+import { Task } from './baseOrder.interface';
+export interface TableOrder extends BaseOrder {
+    readonly tableNum: string;
+    readonly tasks: Task[];
+    readonly operatorId: string;
+}

package/dist/interfaces/order/tableOrder.interface.js

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

package/dist/interfaces/store/store.interface.d.ts

@@ -106,9 +106,10 @@ export interface Store {
         open: boolean;
         autoConfirm: boolean;
         selfPickUp: boolean;
+        selfPickUpUseDeliveryPrice?: boolean;
         enableDelivery: boolean;
-        autoCheckout: boolean;
-        autoCleanTime: number;
+        autoCheckout?: boolean;
+        autoCleanTime?: number;
         reserveSwitch: boolean;
         reserveTimeLow: number;
         reserveTimeHigh: number;
@@ -262,6 +263,7 @@ export interface LabelPrinter {
     disabled: boolean;
     dishIds: string[];
     preferLang?: string;
+    rotate?: boolean;
 }
 interface DayLoopItem {
     startMinute: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freedom_sky/feige-lib",
-  "version": "5.9.0",
+  "version": "5.11.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -1,4 +1,5 @@
-import { Order, Process, Content, Checkout, Task } from './interfaces/order/order.interface';
+import { Order } from './interfaces/order/order.interface';
+import { Process, Content, Checkout, Task } from './interfaces/order/baseOrder.interface';
 import { BuffetCombosItems, Store } from './interfaces/store/store.interface';
 import { VisitTask } from './interfaces/visit-task/visit-task.interface';
 import { User, UserSafe, CertificatePath } from './interfaces/user/user.interface';
@@ -30,6 +31,7 @@ export * from './interfaces/store/store.interface';
 export * from './interfaces/common/language.interface';
 export * from './interfaces/store/subscription.interface';
 export * from './interfaces/store/dish.interface';
+export * from './interfaces/order';
 export { PayCompanyEnum } from './enum/pay-company.enum';
 import * as moment from 'moment';
 import Big from 'big.js';

package/src/interfaces/order/baseOrder.interface.ts

@@ -0,0 +1,88 @@
+import { DishSnapshot } from '../store/dishSnapshot.interface';
+import { PrintStatusEnum } from '../../enum/printer.enum';
+import { OrderTypeEnum } from '../../enum/order.enum';
+import { TaxTypeEnum } from '../../enum/tax.enum';
+
+export interface BaseOrder {
+    readonly _id: string;
+    readonly serialOrderId: string;
+    readonly type: OrderTypeEnum;
+    readonly note?: string;
+    readonly merchantNote?: string;
+    readonly printerPrinted: string[];
+    readonly kdsPrinted: string[];
+    readonly printStatus: PrintStatusEnum;
+    readonly content: Content[];
+    readonly storeId: string;
+    readonly clientId: string;
+    readonly date: Date | string;
+    readonly autoCleanTime?: Date | string;
+    readonly status: string;
+    readonly checkoutFirst: boolean;
+    readonly salesmanId: string;
+    readonly __v: number;
+    readonly process?: Process[];
+    readonly checkout?: Checkout[];
+    readonly payed: boolean;
+    readonly retreated?: boolean;
+    readonly noTax?: boolean;
+    readonly taxType?: TaxTypeEnum;
+    readonly priceHaveTaxBindOrderTaxes?: {
+        name: string;
+        rate: number;
+    }[];
+    readonly taxes?: {
+        name: string;
+        volume: number;
+    }[];
+}
+
+export interface Content {
+    _id?: string;
+    dishSnapshot: DishSnapshot;
+    count: number;
+    weight?: number;
+    delivering?: number;
+    finished?: number;
+    retreated?: number;
+    retreatReason?: string;
+    date?: Date | string;
+}
+
+export interface Task {
+    _id: string;
+    type: string;
+    date: Date | string;
+    dishGroupId?: string;
+    status: string;
+    operatorId?: string;
+    outletNum?: number;
+    count?: number;
+    callReason?: string;
+    content?: Content[];
+    valet?: boolean;
+    printerPrinted: string[];
+    kdsPrinted: string[];
+    printStatus: PrintStatusEnum;
+    clientId: string;
+}
+
+export interface Process {
+    readonly _id?: string;
+    readonly type: string;
+    readonly value: number;
+    readonly volume?: number;
+}
+
+export interface Checkout {
+    readonly _id?: string;
+    readonly type: string;
+    readonly customType?: string;
+    readonly amount: number;
+    readonly realCash?: number;
+    readonly retreated?: boolean;
+    readonly date?: Date | string;
+    readonly payRecordId?: string;
+    readonly memberTransactionId?: string;
+    readonly operatorId?: string;
+}

package/src/interfaces/order/buffetOrder.interface.ts

@@ -0,0 +1,14 @@
+import { TableOrder } from './tableOrder.interface';
+import { BuffetCombosItems } from '../store/store.interface';
+
+export interface BuffetOrder extends TableOrder {
+    readonly buffet: {
+        snapshot: BuffetCombosItems;
+        taxes: {
+            name: string;
+            rate: number;
+        }[];
+    };
+    readonly adultNum: number;
+    readonly childNum: number;
+}

package/src/interfaces/order/deliveryOrder.interface.ts

@@ -0,0 +1,10 @@
+import { BaseOrder } from './baseOrder.interface';
+
+export interface DeliveryOrder extends BaseOrder {
+    readonly selfPickUp: false;
+    readonly phoneNum: string;
+    readonly deliveryFee: number;
+    readonly address: string;
+    readonly nickName: string;
+    readonly reserveTime?: Date;
+}

package/src/interfaces/order/index.ts

@@ -0,0 +1,7 @@
+export * from './deliveryOrder.interface';
+export * from './pickupOrder.interface';
+export * from './order.interface';
+export * from './buffetOrder.interface';
+export * from './tableOrder.interface';
+export * from './serialOrder.interface';
+export * from './baseOrder.interface';

package/src/interfaces/order/order.interface.ts

@@ -1,8 +1,17 @@
 import { DishSnapshot } from '../store/dishSnapshot.interface';
 import { PrintStatusEnum } from '../../enum/printer.enum';
-import { OrderTypeEnum } from '../../enum/order.enum';
-import { TaxTypeEnum } from '../../enum/tax.enum';
+import { DeliveryOrder } from './deliveryOrder.interface';
+import { PickUpOrder } from './pickupOrder.interface';
+import { TableOrder } from './tableOrder.interface';
+import { BuffetOrder } from './buffetOrder.interface';
+import { SerialOrder } from './serialOrder.interface';
+import { OrderTypeEnum, TaxTypeEnum } from '../../index';
+import { Content } from './baseOrder.interface';
+import { Task } from './baseOrder.interface';
+import { Process } from './baseOrder.interface';
+import { Checkout } from './baseOrder.interface';
 import { BuffetCombosItems } from '../store/store.interface';
+
 export interface Order {
     readonly _id: string;
     readonly serialOrderId: string;
@@ -37,6 +46,7 @@ export interface Order {
     readonly taxType?: TaxTypeEnum;
     readonly reserveTime?: Date;
     readonly selfPickUp?: boolean;
+    readonly selfPickUpUseDeliveryPrice?: boolean; //自取使用外卖价格, false表示使用堂食价格
     readonly pack?: boolean;
     readonly priceHaveTaxBindOrderTaxes?: {
         name: string;
@@ -57,52 +67,18 @@ export interface Order {
     readonly childNum?: number;
 }
 
-export interface Content {
-    _id?: string;
-    dishSnapshot: DishSnapshot;
-    count: number;
-    weight?: number;
-    delivering?: number;
-    finished?: number;
-    retreated?: number;
-    retreatReason?: string;
-    date?: Date | string;
-}
+export type AnyOrder = TableOrder | BuffetOrder | SerialOrder | DeliveryOrder | PickUpOrder;
 
-export interface Task {
-    _id: string;
-    type: string;
-    date: Date | string;
-    dishGroupId?: string;
-    status: string;
-    operatorId?: string;
-    outletNum?: number;
-    count?: number;
-    callReason?: string;
-    content?: Content[];
-    valet?: boolean;
-    printerPrinted: string[];
-    kdsPrinted: string[];
-    printStatus: PrintStatusEnum;
-    clientId: string;
+/**
+ * @param order
+ */
+export function isTableOrder(order: Order): order is TableOrder {
+    return order.type === OrderTypeEnum.Table;
 }
 
-export interface Process {
-    readonly _id?: string;
-    readonly type: string;
-    readonly value: number;
-    readonly volume?: number;
-}
-
-export interface Checkout {
-    readonly _id?: string;
-    readonly type: string;
-    readonly customType?: string;
-    readonly amount: number;
-    readonly realCash?: number;
-    readonly retreated?: boolean;
-    readonly date?: Date | string;
-    readonly payRecordId?: string;
-    readonly memberTransactionId?: string;
-    readonly operatorId?: string;
+/**
+ * @param order
+ */
+export function isBuffetOrder(order: Order): order is TableOrder {
+    return order.type === OrderTypeEnum.Buffet;
 }

package/src/interfaces/order/pickupOrder.interface.ts

@@ -0,0 +1,9 @@
+import { BaseOrder } from './baseOrder.interface';
+
+export interface PickUpOrder extends BaseOrder {
+    readonly selfPickUp: true;
+    readonly phoneNum: string;
+    readonly nickName: string;
+    readonly reserveTime?: Date;
+    readonly selfPickUpUseDeliveryPrice: boolean;
+}

package/src/interfaces/order/serialOrder.interface.ts

@@ -0,0 +1,5 @@
+import { BaseOrder } from './baseOrder.interface';
+
+export interface SerialOrder extends BaseOrder {
+    readonly serialNum: string;
+}

package/src/interfaces/order/tableOrder.interface.ts

@@ -0,0 +1,8 @@
+import { BaseOrder } from './baseOrder.interface';
+import { Task } from './baseOrder.interface';
+
+export interface TableOrder extends BaseOrder {
+    readonly tableNum: string;
+    readonly tasks: Task[];
+    readonly operatorId: string;
+}

package/src/interfaces/store/store.interface.ts

@@ -117,9 +117,10 @@ export interface Store {
         open: boolean;
         autoConfirm: boolean;
         selfPickUp: boolean;
+        selfPickUpUseDeliveryPrice?: boolean; //自取使用外卖价格, false表示使用堂食价格
         enableDelivery: boolean;
-        autoCheckout: boolean;
-        autoCleanTime: number;
+        autoCheckout?: boolean;
+        autoCleanTime?: number;
         reserveSwitch: boolean;
         reserveTimeLow: number;
         reserveTimeHigh: number;
@@ -276,6 +277,7 @@ export interface LabelPrinter {
     disabled: boolean;
     dishIds: string[];
     preferLang?: string;
+    rotate?: boolean;
 }
 
 interface DayLoopItem {