@freedom_sky/feige-lib 4.51.6 → 4.52.1

package/.eslintrc.js

@@ -9,5 +9,8 @@
     parserOptions: {
       ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
       sourceType: "module" // Allows for the use of imports
-    }
+    },
+    rules: {
+      '@typescript-eslint/no-use-before-define': 'off',
+    },
   };

package/dist/announcement/enum/announcement.enum.d.ts

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

package/dist/announcement/enum/announcement.enum.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var AnnouncementTypeEnum;
+(function (AnnouncementTypeEnum) {
+    AnnouncementTypeEnum["Text"] = "text";
+    AnnouncementTypeEnum["Image"] = "image";
+})(AnnouncementTypeEnum = exports.AnnouncementTypeEnum || (exports.AnnouncementTypeEnum = {}));
+var AnnouncementTargetEnum;
+(function (AnnouncementTargetEnum) {
+    AnnouncementTargetEnum["Table"] = "table";
+    AnnouncementTargetEnum["Buffet"] = "buffet";
+    AnnouncementTargetEnum["Serial"] = "serial";
+    AnnouncementTargetEnum["PickUp"] = "pickup";
+    AnnouncementTargetEnum["Delivery"] = "delivery";
+})(AnnouncementTargetEnum = exports.AnnouncementTargetEnum || (exports.AnnouncementTargetEnum = {}));

package/dist/buffet/index.d.ts

@@ -1,22 +1,36 @@
-import { BuffetCombosItems, BuffetDishItem } from "../index";
+import { BuffetCombosItems, BuffetDishItem } from '../index';
 /**
  * 计算自助餐总价
  */
-export declare function calcBuffetTotalPrice(buffetCombosItem: BuffetCombosItems, adultNum: number, childNum: number): number;
-export declare function dishShowPriceWithBuffet({ dishPrice, dishId, buffet, orderedCound, adultNum, childNum }: {
-    dishPrice: number;
+/**
+ *
+ */
+export declare function getDishItemInBuffet({ dishId, buffet, }: {
     dishId: string;
     buffet?: BuffetCombosItems;
-    orderedCound: number;
+}): BuffetDishItem | undefined;
+/**
+ *
+ */
+export declare function getMaxBuffetDishUpperLimit({ buffetDishItem, adultNum, childNum, }: {
+    buffetDishItem: BuffetDishItem;
     adultNum: number;
     childNum: number;
 }): number;
-export declare function getDishItemInBuffet({ dishId, buffet }: {
+/**
+ * @param buffetCombosItem
+ * @param adultNum
+ * @param childNum
+ */
+export declare function calcBuffetTotalPrice(buffetCombosItem: BuffetCombosItems, adultNum: number, childNum: number): number;
+/**
+ *
+ */
+export declare function dishShowPriceWithBuffet({ dishPrice, dishId, buffet, orderedCound, adultNum, childNum, }: {
+    dishPrice: number;
     dishId: string;
     buffet?: BuffetCombosItems;
-}): BuffetDishItem | undefined;
-export declare function getMaxBuffetDishUpperLimit({ buffetDishItem, adultNum, childNum }: {
-    buffetDishItem: BuffetDishItem;
+    orderedCound: number;
     adultNum: number;
     childNum: number;
 }): number;

package/dist/buffet/index.js

@@ -3,10 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * 计算自助餐总价
  */
+/**
+ *
+ */
+function getDishItemInBuffet(_a) {
+    var dishId = _a.dishId, buffet = _a.buffet;
+    return buffet === null || buffet === void 0 ? void 0 : buffet.dishes.find(function (item) { return String(item.dishId) === String(dishId); });
+}
+exports.getDishItemInBuffet = getDishItemInBuffet;
+/**
+ *
+ */
+function getMaxBuffetDishUpperLimit(_a) {
+    var buffetDishItem = _a.buffetDishItem, adultNum = _a.adultNum, childNum = _a.childNum;
+    if (!buffetDishItem)
+        throw 'No buffet dish item';
+    if (!buffetDishItem.upperLimit.enable)
+        return Infinity;
+    return Math.ceil(buffetDishItem.upperLimit.adult * adultNum + buffetDishItem.upperLimit.child * childNum);
+}
+exports.getMaxBuffetDishUpperLimit = getMaxBuffetDishUpperLimit;
+/**
+ * @param buffetCombosItem
+ * @param adultNum
+ * @param childNum
+ */
 function calcBuffetTotalPrice(buffetCombosItem, adultNum, childNum) {
     return buffetCombosItem.price.adult * adultNum + buffetCombosItem.price.child * childNum;
 }
 exports.calcBuffetTotalPrice = calcBuffetTotalPrice;
+/**
+ *
+ */
 function dishShowPriceWithBuffet(_a) {
     var dishPrice = _a.dishPrice, dishId = _a.dishId, buffet = _a.buffet, orderedCound = _a.orderedCound, adultNum = _a.adultNum, childNum = _a.childNum;
     var buffetDishItem = getDishItemInBuffet({ dishId: dishId, buffet: buffet });
@@ -23,17 +51,3 @@ function dishShowPriceWithBuffet(_a) {
     }
 }
 exports.dishShowPriceWithBuffet = dishShowPriceWithBuffet;
-function getDishItemInBuffet(_a) {
-    var dishId = _a.dishId, buffet = _a.buffet;
-    return buffet === null || buffet === void 0 ? void 0 : buffet.dishes.find(function (item) { return String(item.dishId) === String(dishId); });
-}
-exports.getDishItemInBuffet = getDishItemInBuffet;
-function getMaxBuffetDishUpperLimit(_a) {
-    var buffetDishItem = _a.buffetDishItem, adultNum = _a.adultNum, childNum = _a.childNum;
-    if (!buffetDishItem)
-        throw 'No buffet dish item';
-    if (!buffetDishItem.upperLimit.enable)
-        return Infinity;
-    return Math.ceil(buffetDishItem.upperLimit.adult * adultNum + buffetDishItem.upperLimit.child * childNum);
-}
-exports.getMaxBuffetDishUpperLimit = getMaxBuffetDishUpperLimit;

package/dist/enum/timezone.emum.d.ts

@@ -26,6 +26,7 @@ export declare enum TimeZoneEnum {
     'UTC+8' = 8,
     'UTC+9' = 9,
     'UTC+9.5' = 9.5,
+    'UTC+10.5' = 10.5,
     'UTC+10' = 10,
     'UTC+11' = 11,
     'UTC+12' = 12

package/dist/enum/timezone.emum.js

@@ -29,6 +29,7 @@ var TimeZoneEnum;
     TimeZoneEnum[TimeZoneEnum["UTC+8"] = 8] = "UTC+8";
     TimeZoneEnum[TimeZoneEnum["UTC+9"] = 9] = "UTC+9";
     TimeZoneEnum[TimeZoneEnum["UTC+9.5"] = 9.5] = "UTC+9.5";
+    TimeZoneEnum[TimeZoneEnum["UTC+10.5"] = 10.5] = "UTC+10.5";
     TimeZoneEnum[TimeZoneEnum["UTC+10"] = 10] = "UTC+10";
     TimeZoneEnum[TimeZoneEnum["UTC+11"] = 11] = "UTC+11";
     TimeZoneEnum[TimeZoneEnum["UTC+12"] = 12] = "UTC+12";

package/dist/index.d.ts

@@ -21,6 +21,7 @@ export * from './enum/visit-task.enum';
 export * from './enum/receptionist.enum';
 export * from './enum/from.enum';
 export * from './enum/role.enum';
+export * from './announcement/enum/announcement.enum';
 export * from './interfaces/member/member.interface';
 export * from './interfaces/member/member-transaction.interface';
 export * from './interfaces/store/store.interface';
@@ -56,7 +57,10 @@ export declare function calcDishFinalPrice(conent: Content): number;
  *
  */
 export declare function calcTotalPrice(order: Order): number;
-export declare function calcContentPrice({ orderContentItem, buffetItem, orderType, adultNum, childNum, contents }: {
+/**
+ *
+ */
+export declare function calcContentPrice({ orderContentItem, buffetItem, orderType, adultNum, childNum, contents, }: {
     orderContentItem: Content;
     buffetItem: BuffetCombosItems;
     orderType: OrderTypeEnum;
@@ -64,6 +68,11 @@ export declare function calcContentPrice({ orderContentItem, buffetItem, orderTy
     childNum: number;
     contents: Content[];
 }): number;
+/**
+ * @param dishId
+ * @param contents
+ * @param beforeKey
+ */
 export declare function getOrderedCountByDishId(dishId: any, contents: Content[], beforeKey?: string): number;
 /**
  * 计算处理后的应收金额

package/dist/index.js

@@ -26,6 +26,7 @@ __export(require("./enum/visit-task.enum"));
 __export(require("./enum/receptionist.enum"));
 __export(require("./enum/from.enum"));
 __export(require("./enum/role.enum"));
+__export(require("./announcement/enum/announcement.enum"));
 var pay_company_enum_1 = require("./enum/pay-company.enum");
 exports.PayCompanyEnum = pay_company_enum_1.PayCompanyEnum;
 var moment = require("moment");
@@ -96,7 +97,7 @@ function calcTotalPrice(order) {
             orderType: order.type,
             adultNum: order.adultNum,
             childNum: order.childNum,
-            contents: order.content
+            contents: order.content,
         });
     });
     if (order.deliveryFee && !order.selfPickUp) {
@@ -108,12 +109,19 @@ function calcTotalPrice(order) {
     return parseMoney(totalPrice);
 }
 exports.calcTotalPrice = calcTotalPrice;
+/**
+ *
+ */
 function calcContentPrice(_a) {
     var orderContentItem = _a.orderContentItem, buffetItem = _a.buffetItem, orderType = _a.orderType, adultNum = _a.adultNum, childNum = _a.childNum, contents = _a.contents;
     if (orderType === order_enum_1.OrderTypeEnum.Buffet) {
         var buffetDishItem = index_1.getDishItemInBuffet({ dishId: orderContentItem.dishSnapshot._id, buffet: buffetItem });
         if (buffetDishItem) {
-            var maxUpperLimit = index_1.getMaxBuffetDishUpperLimit({ buffetDishItem: buffetDishItem, adultNum: adultNum, childNum: childNum });
+            var maxUpperLimit = index_1.getMaxBuffetDishUpperLimit({
+                buffetDishItem: buffetDishItem,
+                adultNum: adultNum,
+                childNum: childNum,
+            });
             var beforeCount = getOrderedCountByDishId(orderContentItem.dishSnapshot._id, contents, orderContentItem._id);
             var maxUpperLimitForThisItem = Math.max(maxUpperLimit - beforeCount, 0);
             if (maxUpperLimitForThisItem >= orderContentItem.count) {
@@ -132,6 +140,11 @@ function calcContentPrice(_a) {
     }
 }
 exports.calcContentPrice = calcContentPrice;
+/**
+ * @param dishId
+ * @param contents
+ * @param beforeKey
+ */
 function getOrderedCountByDishId(dishId, contents, beforeKey) {
     var count = 0;
     for (var _i = 0, _a = contents.filter(function (content) { return String(content.dishSnapshot._id) === String(dishId); }); _i < _a.length; _i++) {
@@ -173,7 +186,14 @@ function calcReceivablePrice(order, processArr, noTax) {
                 if (orderContentItem.dishSnapshot.noFullOrderDiscount) {
                     return;
                 }
-                var dishTotalPrice = calcContentPrice({ orderContentItem: orderContentItem, buffetItem: (_a = order.buffet) === null || _a === void 0 ? void 0 : _a.snapshot, orderType: order.type, adultNum: order.adultNum, childNum: order.childNum, contents: order.content });
+                var dishTotalPrice = calcContentPrice({
+                    orderContentItem: orderContentItem,
+                    buffetItem: (_a = order.buffet) === null || _a === void 0 ? void 0 : _a.snapshot,
+                    orderType: order.type,
+                    adultNum: order.adultNum,
+                    childNum: order.childNum,
+                    contents: order.content,
+                });
                 totalDiscountPrice += dishTotalPrice;
                 volume_1 += dishTotalPrice * rate_1;
             });
@@ -221,7 +241,14 @@ function calcReceivablePrice(order, processArr, noTax) {
                 return;
             }
             var discountValue = (_a = sortedProcessArr.find(function (process) { return process.type === const_1.CONST.RECEIVABLE_PROCESSING_TYPE.DISCOUNT.TYPE; })) === null || _a === void 0 ? void 0 : _a.value;
-            var dishTotalPrice = calcContentPrice({ orderContentItem: orderContentItem, buffetItem: (_b = order.buffet) === null || _b === void 0 ? void 0 : _b.snapshot, orderType: order.type, adultNum: order.adultNum, childNum: order.childNum, contents: order.content });
+            var dishTotalPrice = calcContentPrice({
+                orderContentItem: orderContentItem,
+                buffetItem: (_b = order.buffet) === null || _b === void 0 ? void 0 : _b.snapshot,
+                orderType: order.type,
+                adultNum: order.adultNum,
+                childNum: order.childNum,
+                contents: order.content,
+            });
             if (discountValue && !orderContentItem.dishSnapshot.noFullOrderDiscount) {
                 var rate = -(10 - discountValue) / 10;
                 dishTotalPrice += dishTotalPrice * rate;

package/package.json

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

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

@@ -0,0 +1,12 @@
+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,15 +1,68 @@
-import {BuffetCombosItems, BuffetDishItem} from "../index"
+import { BuffetCombosItems, BuffetDishItem } from '../index';
 /**
  * 计算自助餐总价
  */
-export function calcBuffetTotalPrice(buffetCombosItem:BuffetCombosItems, adultNum: number, childNum: number): number {
-    return buffetCombosItem.price.adult*adultNum + buffetCombosItem.price.child* childNum
+
+/**
+ *
+ */
+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})) {
+/**
+ *
+ */
+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;
@@ -18,13 +71,3 @@ export function dishShowPriceWithBuffet({dishPrice, dishId, buffet, orderedCound
         return dishPrice;
     }
 }
-
-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);
-}

package/src/enum/timezone.emum.ts

@@ -26,6 +26,7 @@ export enum TimeZoneEnum {
     'UTC+8' = 8,
     'UTC+9' = 9,
     'UTC+9.5' = 9.5,
+    'UTC+10.5' = 10.5,
     'UTC+10' = 10,
     'UTC+11' = 11,
     'UTC+12' = 12,

package/src/index.ts

@@ -22,6 +22,7 @@ export * from './enum/visit-task.enum';
 export * from './enum/receptionist.enum';
 export * from './enum/from.enum';
 export * from './enum/role.enum';
+export * from './announcement/enum/announcement.enum';
 export * from './interfaces/member/member.interface';
 export * from './interfaces/member/member-transaction.interface';
 export * from './interfaces/store/store.interface';
@@ -107,54 +108,83 @@ export function calcDishFinalPrice(conent: Content): number {
 export function calcTotalPrice(order: Order): number {
     let totalPrice = 0;
     order.content.forEach((orderContentItem) => {
-        totalPrice+=calcContentPrice({
+        totalPrice += calcContentPrice({
             orderContentItem,
             buffetItem: order.buffet?.snapshot,
             orderType: order.type,
             adultNum: order.adultNum,
             childNum: order.childNum,
-            contents: order.content
-        })
+            contents: order.content,
+        });
     });
     if (order.deliveryFee && !order.selfPickUp) {
         totalPrice += order.deliveryFee;
     }
-    if(order.type === OrderTypeEnum.Buffet) {
-        totalPrice += calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum)
+    if (order.type === OrderTypeEnum.Buffet) {
+        totalPrice += calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum);
     }
     return parseMoney(totalPrice);
 }
 
-export function calcContentPrice({orderContentItem,buffetItem, orderType, adultNum, childNum,contents}:{orderContentItem:Content, buffetItem: BuffetCombosItems, orderType: OrderTypeEnum, adultNum: number, childNum: number, contents:Content[]}): number {
-        if(orderType === OrderTypeEnum.Buffet) {
-            const buffetDishItem = getDishItemInBuffet({dishId:orderContentItem.dishSnapshot._id, buffet: buffetItem});
-            if(buffetDishItem) {
-                const maxUpperLimit = getMaxBuffetDishUpperLimit({buffetDishItem, adultNum: adultNum, childNum: childNum});
-                const beforeCount = getOrderedCountByDishId(orderContentItem.dishSnapshot._id, contents, orderContentItem._id);
-                const maxUpperLimitForThisItem = Math.max(maxUpperLimit - beforeCount, 0)
-                if(maxUpperLimitForThisItem>=orderContentItem.count) {
-                    return 0;
-                } else {
-                    return (orderContentItem.count-maxUpperLimitForThisItem) * calcDishFinalPrice(orderContentItem);
-                }
-            }else {
-                return orderContentItem.count * calcDishFinalPrice(orderContentItem);
+/**
+ *
+ */
+export function calcContentPrice({
+    orderContentItem,
+    buffetItem,
+    orderType,
+    adultNum,
+    childNum,
+    contents,
+}: {
+    orderContentItem: Content;
+    buffetItem: BuffetCombosItems;
+    orderType: OrderTypeEnum;
+    adultNum: number;
+    childNum: number;
+    contents: Content[];
+}): number {
+    if (orderType === OrderTypeEnum.Buffet) {
+        const buffetDishItem = getDishItemInBuffet({ dishId: orderContentItem.dishSnapshot._id, buffet: buffetItem });
+        if (buffetDishItem) {
+            const maxUpperLimit = getMaxBuffetDishUpperLimit({
+                buffetDishItem,
+                adultNum: adultNum,
+                childNum: childNum,
+            });
+            const beforeCount = getOrderedCountByDishId(
+                orderContentItem.dishSnapshot._id,
+                contents,
+                orderContentItem._id,
+            );
+            const maxUpperLimitForThisItem = Math.max(maxUpperLimit - beforeCount, 0);
+            if (maxUpperLimitForThisItem >= orderContentItem.count) {
+                return 0;
+            } else {
+                return (orderContentItem.count - maxUpperLimitForThisItem) * calcDishFinalPrice(orderContentItem);
             }
         } else {
             return orderContentItem.count * calcDishFinalPrice(orderContentItem);
         }
+    } else {
+        return orderContentItem.count * calcDishFinalPrice(orderContentItem);
+    }
 }
 
-export function getOrderedCountByDishId(dishId, contents:Content[], beforeKey?:string): number{
+/**
+ * @param dishId
+ * @param contents
+ * @param beforeKey
+ */
+export function getOrderedCountByDishId(dishId, contents: Content[], beforeKey?: string): number {
     let count = 0;
-    for(let content of contents.filter(content=>String(content.dishSnapshot._id)===String(dishId))) {
-        if(beforeKey && String(content._id) === String(beforeKey)) break;
-        count += content.count
+    for (const content of contents.filter((content) => String(content.dishSnapshot._id) === String(dishId))) {
+        if (beforeKey && String(content._id) === String(beforeKey)) break;
+        count += content.count;
     }
-    return count
+    return count;
 }
 
-
 /**
  * 计算处理后的应收金额
  *
@@ -198,12 +228,19 @@ export function calcReceivablePrice(
                 if (orderContentItem.dishSnapshot.noFullOrderDiscount) {
                     return;
                 }
-                const dishTotalPrice = calcContentPrice({orderContentItem, buffetItem:order.buffet?.snapshot, orderType: order.type, adultNum:order.adultNum,childNum:order.childNum, contents: order.content})
+                const dishTotalPrice = calcContentPrice({
+                    orderContentItem,
+                    buffetItem: order.buffet?.snapshot,
+                    orderType: order.type,
+                    adultNum: order.adultNum,
+                    childNum: order.childNum,
+                    contents: order.content,
+                });
                 totalDiscountPrice += dishTotalPrice;
                 volume += dishTotalPrice * rate;
             });
-            if(order.type === OrderTypeEnum.Buffet) {
-                const buffetTotalPrice = calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum)
+            if (order.type === OrderTypeEnum.Buffet) {
+                const buffetTotalPrice = calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum);
                 totalDiscountPrice += buffetTotalPrice;
                 volume += buffetTotalPrice * rate;
             }
@@ -245,7 +282,14 @@ export function calcReceivablePrice(
             const discountValue = sortedProcessArr.find(
                 (process) => process.type === CONST.RECEIVABLE_PROCESSING_TYPE.DISCOUNT.TYPE,
             )?.value;
-            let dishTotalPrice = calcContentPrice({orderContentItem, buffetItem:order.buffet?.snapshot, orderType: order.type, adultNum:order.adultNum,childNum:order.childNum, contents: order.content});
+            let dishTotalPrice = calcContentPrice({
+                orderContentItem,
+                buffetItem: order.buffet?.snapshot,
+                orderType: order.type,
+                adultNum: order.adultNum,
+                childNum: order.childNum,
+                contents: order.content,
+            });
             if (discountValue && !orderContentItem.dishSnapshot.noFullOrderDiscount) {
                 const rate = -(10 - discountValue) / 10;
                 dishTotalPrice += dishTotalPrice * rate;

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

@@ -46,8 +46,8 @@ export interface Order {
         name: string;
         volume: number;
     }[];
-    readonly buffet?:{
-        snapshot: BuffetCombosItems,
+    readonly buffet?: {
+        snapshot: BuffetCombosItems;
     };
     readonly adultNum?: number;
     readonly childNum?: number;