@freedom_sky/feige-lib 5.22.0 → 5.23.0

package/josn-hub/orders//351/203/250/345/210/206/351/200/200/350/217/234/347/232/204/346/203/205/345/206/265.ts

@@ -1,73 +1,73 @@
-// 总价应该是23.2
-export const order: any = {
-    _id: '658e5ff5fca6bd001ad1f284',
-    buffet: {
-        taxes: [],
-    },
-    checkoutFirst: false,
-    printed: [],
-    printerPrinted: [],
-    kdsPrinted: [],
-    printStatus: 'NotPrinted',
-    operatorId: null,
-    salesmanId: null,
-    status: 'processing',
-    payed: false,
-    noTax: false,
-    reserveTime: null,
-    selfPickUp: false,
-    pack: false,
-    storeId: '5fdf7149f973ec00135fa626',
-    tableNum: '20AAA',
-    content: [
-        {
-            delivering: 3,
-            finished: 0,
-            retreated: 1,
-            _id: '658e5ff5fca6bd001ad1f285',
-            dishSnapshot: {
-                names: {
-                    vi: '可乐Coca',
-                },
-                descriptions: {
-                    vi: '',
-                },
-                units: {
-                    vi: null,
-                },
-                type: 'Normal',
-                description: '',
-                soldOut: false,
-                required: false,
-                specifications: [],
-                salesType: ['dine', 'takeout'],
-                takeoutPrice: null,
-                __v: 1,
-                date: '2022-04-22T00:02:00.894Z',
-                _id: '6261f078a108d8001a088f36',
-                name: '可乐Coca',
-                price: 20000,
-                img: 'https://feige-img-hub.oss-cn-hangzhou.aliyuncs.com/898393196/1650585714021-eabHK2a3aA.jpg',
-                chef: null,
-                selectedSpecifications: [],
-                noFullOrderDiscount: false,
-                taxes: [],
-            },
-            count: 3,
-            date: '2023-12-29T05:58:13.238Z',
-            retreatReason: null,
-        },
-    ],
-    clientId: '432427e0-a60e-11ee-b732-cf7d64356d46',
-    type: 'table',
-    tasks: [],
-    priceHaveTaxBindOrderTaxes: [],
-    serialOrderId: '20231229-12',
-    checkout: [],
-    process: [],
-    taxes: [],
-    date: '2023-12-29T05:58:13.240Z',
-    __v: 9,
-    autoCleanTime: '2023-12-29T05:58:13.264Z',
-};
-export const expectPrice = 60000;
+// 总价应该是23.2
+export const order: any = {
+    _id: '658e5ff5fca6bd001ad1f284',
+    buffet: {
+        taxes: [],
+    },
+    checkoutFirst: false,
+    printed: [],
+    printerPrinted: [],
+    kdsPrinted: [],
+    printStatus: 'NotPrinted',
+    operatorId: null,
+    salesmanId: null,
+    status: 'processing',
+    payed: false,
+    noTax: false,
+    reserveTime: null,
+    selfPickUp: false,
+    pack: false,
+    storeId: '5fdf7149f973ec00135fa626',
+    tableNum: '20AAA',
+    content: [
+        {
+            delivering: 3,
+            finished: 0,
+            retreated: 1,
+            _id: '658e5ff5fca6bd001ad1f285',
+            dishSnapshot: {
+                names: {
+                    vi: '可乐Coca',
+                },
+                descriptions: {
+                    vi: '',
+                },
+                units: {
+                    vi: null,
+                },
+                type: 'Normal',
+                description: '',
+                soldOut: false,
+                required: false,
+                specifications: [],
+                salesType: ['dine', 'takeout'],
+                takeoutPrice: null,
+                __v: 1,
+                date: '2022-04-22T00:02:00.894Z',
+                _id: '6261f078a108d8001a088f36',
+                name: '可乐Coca',
+                price: 20000,
+                img: 'https://feige-img-hub.oss-cn-hangzhou.aliyuncs.com/898393196/1650585714021-eabHK2a3aA.jpg',
+                chef: null,
+                selectedSpecifications: [],
+                noFullOrderDiscount: false,
+                taxes: [],
+            },
+            count: 3,
+            date: '2023-12-29T05:58:13.238Z',
+            retreatReason: null,
+        },
+    ],
+    clientId: '432427e0-a60e-11ee-b732-cf7d64356d46',
+    type: 'table',
+    tasks: [],
+    priceHaveTaxBindOrderTaxes: [],
+    serialOrderId: '20231229-12',
+    checkout: [],
+    process: [],
+    taxes: [],
+    date: '2023-12-29T05:58:13.240Z',
+    __v: 9,
+    autoCleanTime: '2023-12-29T05:58:13.264Z',
+};
+export const expectPrice = 60000;

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "@freedom_sky/feige-lib",
-  "version": "5.22.0",
-  "description": "",
-  "main": "dist/index.js",
-  "scripts": {
-    "dev": "tsc -w",
-    "build": "npm run test && tsc",
-    "lint": "tsc --noEmit && eslint 'src/**/*.{js,ts}' --quiet --fix",
-    "test": "jest",
-    "prepublishOnly": "npm run build",
-    "release": "npm publish"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run test && tsc --noEmit && lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,ts}": [
-      "eslint --fix"
-    ]
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/freedom-git/feige-lib.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/freedom-git/feige-lib/issues"
-  },
-  "homepage": "https://github.com/freedom-git/feige-lib#readme",
-  "publishConfig": {
-    "access": "public"
-  },
-  "devDependencies": {
-    "@types/big.js": "^6.1.2",
-    "@types/jest": "^25.2.1",
-    "@types/node": "^13.13.2",
-    "@typescript-eslint/eslint-plugin": "^2.29.0",
-    "@typescript-eslint/parser": "^2.29.0",
-    "eslint": "^6.8.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-jsdoc": "^24.0.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "husky": "^4.2.5",
-    "jest": "^25.5.4",
-    "lint-staged": "^10.1.7",
-    "prettier": "^2.0.5",
-    "ts-jest": "^25.4.0",
-    "typescript": "^3.8.3"
-  },
-  "dependencies": {
-    "big.js": "^6.1.1",
-    "moment": "^2.29.1"
-  }
-}
+{
+  "name": "@freedom_sky/feige-lib",
+  "version": "5.23.0",
+  "description": "",
+  "main": "dist/index.js",
+  "scripts": {
+    "dev": "tsc -w",
+    "build": "npm run test && tsc",
+    "lint": "tsc --noEmit && eslint 'src/**/*.{js,ts}' --quiet --fix",
+    "test": "jest",
+    "prepublishOnly": "npm run build",
+    "release": "npm publish"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run test && tsc --noEmit && lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{js,ts}": [
+      "eslint --fix"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/freedom-git/feige-lib.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/freedom-git/feige-lib/issues"
+  },
+  "homepage": "https://github.com/freedom-git/feige-lib#readme",
+  "publishConfig": {
+    "access": "public"
+  },
+  "devDependencies": {
+    "@types/big.js": "^6.1.2",
+    "@types/jest": "^25.2.1",
+    "@types/node": "^13.13.2",
+    "@typescript-eslint/eslint-plugin": "^2.29.0",
+    "@typescript-eslint/parser": "^2.29.0",
+    "eslint": "^6.8.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-jsdoc": "^24.0.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "husky": "^4.2.5",
+    "jest": "^25.5.4",
+    "lint-staged": "^10.1.7",
+    "prettier": "^2.0.5",
+    "ts-jest": "^25.4.0",
+    "typescript": "^3.8.3"
+  },
+  "dependencies": {
+    "big.js": "^6.1.1",
+    "moment": "^2.29.1"
+  }
+}

package/src/announcement/enum/announcement.enum.ts

@@ -1,12 +1,12 @@
-export enum AnnouncementTypeEnum {
-    Text = 'text',
-    Image = 'image',
-}
-
-export enum AnnouncementTargetEnum {
-    Table = 'table',
-    Buffet = 'buffet',
-    Serial = 'serial',
-    PickUp = 'pickup',
-    Delivery = 'delivery',
-}
+export enum AnnouncementTypeEnum {
+    Text = 'text',
+    Image = 'image',
+}
+
+export enum AnnouncementTargetEnum {
+    Table = 'table',
+    Buffet = 'buffet',
+    Serial = 'serial',
+    PickUp = 'pickup',
+    Delivery = 'delivery',
+}

package/src/buffet/index.ts

@@ -1,123 +1,123 @@
-import { BuffetCombosItems, BuffetDishItem, Order, CONST, OrderTypeEnum } from '../index';
-/**
- * 计算自助餐总价
- */
-
-/**
- *
- */
-export function getDishItemInBuffet({
-    dishId,
-    buffet,
-}: {
-    dishId: string;
-    buffet?: BuffetCombosItems;
-}): BuffetDishItem | undefined {
-    return buffet?.dishes.find((item) => String(item.dishId) === String(dishId));
-}
-
-/**
- *
- */
-export function getMaxBuffetDishUpperLimit({
-    buffetDishItem,
-    adultNum,
-    childNum,
-}: {
-    buffetDishItem: BuffetDishItem;
-    adultNum: number;
-    childNum: number;
-}): number {
-    if (!buffetDishItem) throw 'No buffet dish item';
-    if (!buffetDishItem.upperLimit.enable) return Infinity;
-    return Math.ceil(buffetDishItem.upperLimit.adult * adultNum + buffetDishItem.upperLimit.child * childNum);
-}
-
-/**
- * @param buffetCombosItem
- * @param adultNum
- * @param childNum
- */
-export function calcBuffetTotalPrice(buffetCombosItem: BuffetCombosItems, adultNum: number, childNum: number): number {
-    return buffetCombosItem.price.adult * adultNum + buffetCombosItem.price.child * childNum;
-}
-
-/**
- *
- */
-export function dishShowPriceWithBuffet({
-    dishPrice,
-    dishId,
-    buffet,
-    orderedCound,
-    adultNum,
-    childNum,
-}: {
-    dishPrice: number;
-    dishId: string;
-    buffet?: BuffetCombosItems;
-    orderedCound: number;
-    adultNum: number;
-    childNum: number;
-}) {
-    const buffetDishItem = getDishItemInBuffet({ dishId, buffet });
-    if (buffetDishItem) {
-        if (orderedCound < getMaxBuffetDishUpperLimit({ buffetDishItem, adultNum, childNum })) {
-            return 0;
-        } else {
-            return dishPrice;
-        }
-    } else {
-        return dishPrice;
-    }
-}
-
-/**
- *
- */
-export function getRoundCoundAndSecondsToNextTurn({
-    order,
-}: {
-    order: Order;
-}): {
-    roundCount?: number;
-    maxRounds?: number;
-    secondsToNextTurn: number;
-} {
-    let secondsToNextTurn = 0;
-    const buffetCombosItems = order.buffet?.snapshot;
-    if (!buffetCombosItems.orderingByTurns?.enable) {
-        throw 'Buffet ordering by turns is not enabled';
-    }
-    const { interval, maxRounds } = buffetCombosItems.orderingByTurns;
-    const previousBuffetSubmitTasks = order.tasks.filter(
-        (task) =>
-            (task.type === CONST.TASK_TYPE.CHECK || task.type === CONST.TASK_TYPE.APPEND) &&
-            _haveAtLeastOneSameItem(
-                task.content.map((content) => String(content.dishSnapshot._id)),
-                buffetCombosItems.dishes.map((dish) => String(dish.dishId)),
-            ),
-    );
-    if (previousBuffetSubmitTasks.length === 0) {
-        secondsToNextTurn = 0;
-    } else if (previousBuffetSubmitTasks.length >= maxRounds) {
-        secondsToNextTurn = Infinity;
-    } else {
-        const lastBuffetSubmitTime = previousBuffetSubmitTasks[previousBuffetSubmitTasks.length - 1].date;
-        secondsToNextTurn = interval * 60 - Math.floor((Date.now() - new Date(lastBuffetSubmitTime).getTime()) / 1000);
-    }
-    return {
-        roundCount: previousBuffetSubmitTasks.length,
-        secondsToNextTurn,
-        maxRounds,
-    };
-}
-
-/**
- * @param arr1
- * @param arr2
- */
-function _haveAtLeastOneSameItem<T>(arr1: T[], arr2: T[]): boolean {
-    const set1 = new Set(arr1);
-    return arr2.some((item) => set1.has(item));
-}
+import { BuffetCombosItems, BuffetDishItem, Order, CONST, OrderTypeEnum } from '../index';
+/**
+ * 计算自助餐总价
+ */
+
+/**
+ *
+ */
+export function getDishItemInBuffet({
+    dishId,
+    buffet,
+}: {
+    dishId: string;
+    buffet?: BuffetCombosItems;
+}): BuffetDishItem | undefined {
+    return buffet?.dishes.find((item) => String(item.dishId) === String(dishId));
+}
+
+/**
+ *
+ */
+export function getMaxBuffetDishUpperLimit({
+    buffetDishItem,
+    adultNum,
+    childNum,
+}: {
+    buffetDishItem: BuffetDishItem;
+    adultNum: number;
+    childNum: number;
+}): number {
+    if (!buffetDishItem) throw 'No buffet dish item';
+    if (!buffetDishItem.upperLimit.enable) return Infinity;
+    return Math.ceil(buffetDishItem.upperLimit.adult * adultNum + buffetDishItem.upperLimit.child * childNum);
+}
+
+/**
+ * @param buffetCombosItem
+ * @param adultNum
+ * @param childNum
+ */
+export function calcBuffetTotalPrice(buffetCombosItem: BuffetCombosItems, adultNum: number, childNum: number): number {
+    return buffetCombosItem.price.adult * adultNum + buffetCombosItem.price.child * childNum;
+}
+
+/**
+ *
+ */
+export function dishShowPriceWithBuffet({
+    dishPrice,
+    dishId,
+    buffet,
+    orderedCound,
+    adultNum,
+    childNum,
+}: {
+    dishPrice: number;
+    dishId: string;
+    buffet?: BuffetCombosItems;
+    orderedCound: number;
+    adultNum: number;
+    childNum: number;
+}) {
+    const buffetDishItem = getDishItemInBuffet({ dishId, buffet });
+    if (buffetDishItem) {
+        if (orderedCound < getMaxBuffetDishUpperLimit({ buffetDishItem, adultNum, childNum })) {
+            return 0;
+        } else {
+            return dishPrice;
+        }
+    } else {
+        return dishPrice;
+    }
+}
+
+/**
+ *
+ */
+export function getRoundCoundAndSecondsToNextTurn({
+    order,
+}: {
+    order: Order;
+}): {
+    roundCount?: number;
+    maxRounds?: number;
+    secondsToNextTurn: number;
+} {
+    let secondsToNextTurn = 0;
+    const buffetCombosItems = order.buffet?.snapshot;
+    if (!buffetCombosItems.orderingByTurns?.enable) {
+        throw 'Buffet ordering by turns is not enabled';
+    }
+    const { interval, maxRounds } = buffetCombosItems.orderingByTurns;
+    const previousBuffetSubmitTasks = order.tasks.filter(
+        (task) =>
+            (task.type === CONST.TASK_TYPE.CHECK || task.type === CONST.TASK_TYPE.APPEND) &&
+            _haveAtLeastOneSameItem(
+                task.content.map((content) => String(content.dishSnapshot._id)),
+                buffetCombosItems.dishes.map((dish) => String(dish.dishId)),
+            ),
+    );
+    if (previousBuffetSubmitTasks.length === 0) {
+        secondsToNextTurn = 0;
+    } else if (previousBuffetSubmitTasks.length >= maxRounds) {
+        secondsToNextTurn = Infinity;
+    } else {
+        const lastBuffetSubmitTime = previousBuffetSubmitTasks[previousBuffetSubmitTasks.length - 1].date;
+        secondsToNextTurn = interval * 60 - Math.floor((Date.now() - new Date(lastBuffetSubmitTime).getTime()) / 1000);
+    }
+    return {
+        roundCount: previousBuffetSubmitTasks.length,
+        secondsToNextTurn,
+        maxRounds,
+    };
+}
+
+/**
+ * @param arr1
+ * @param arr2
+ */
+function _haveAtLeastOneSameItem<T>(arr1: T[], arr2: T[]): boolean {
+    const set1 = new Set(arr1);
+    return arr2.some((item) => set1.has(item));
+}