@freedom_sky/feige-lib 4.51.4 → 4.51.6

package/dist/buffet/index.js

@@ -25,7 +25,7 @@ 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 item.dishId === dishId; });
+    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) {

package/dist/index.js

@@ -134,9 +134,9 @@ function calcContentPrice(_a) {
 exports.calcContentPrice = calcContentPrice;
 function getOrderedCountByDishId(dishId, contents, beforeKey) {
     var count = 0;
-    for (var _i = 0, _a = contents.filter(function (content) { return content.dishSnapshot._id === dishId; }); _i < _a.length; _i++) {
+    for (var _i = 0, _a = contents.filter(function (content) { return String(content.dishSnapshot._id) === String(dishId); }); _i < _a.length; _i++) {
         var content = _a[_i];
-        if (beforeKey && content._id === beforeKey)
+        if (beforeKey && String(content._id) === String(beforeKey))
             break;
         count += content.count;
     }
@@ -177,6 +177,11 @@ function calcReceivablePrice(order, processArr, noTax) {
                 totalDiscountPrice += dishTotalPrice;
                 volume_1 += dishTotalPrice * rate_1;
             });
+            if (order.type === order_enum_1.OrderTypeEnum.Buffet) {
+                var buffetTotalPrice = index_1.calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum);
+                totalDiscountPrice += buffetTotalPrice;
+                volume_1 += buffetTotalPrice * rate_1;
+            }
             resultProcessArr.push({
                 type: process.type,
                 value: process.value,

package/package.json

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

package/src/buffet/index.ts

@@ -20,7 +20,7 @@ export function dishShowPriceWithBuffet({dishPrice, dishId, buffet, orderedCound
 }
 
 export function getDishItemInBuffet({dishId, buffet}:{dishId:string, buffet?: BuffetCombosItems}):BuffetDishItem|undefined  {
-    return buffet?.dishes.find((item)=>item.dishId===dishId)
+    return buffet?.dishes.find((item)=>String(item.dishId)===String(dishId))
 }
 
 export function getMaxBuffetDishUpperLimit({buffetDishItem, adultNum, childNum}:{buffetDishItem:BuffetDishItem, adultNum: number, childNum: number}):number  {

package/src/index.ts

@@ -147,8 +147,8 @@ export function calcContentPrice({orderContentItem,buffetItem, orderType, adultN
 
 export function getOrderedCountByDishId(dishId, contents:Content[], beforeKey?:string): number{
     let count = 0;
-    for(let content of contents.filter(content=>content.dishSnapshot._id===dishId)) {
-        if(beforeKey && content._id === beforeKey) break;
+    for(let content of contents.filter(content=>String(content.dishSnapshot._id)===String(dishId))) {
+        if(beforeKey && String(content._id) === String(beforeKey)) break;
         count += content.count
     }
     return count
@@ -202,6 +202,11 @@ export function calcReceivablePrice(
                 totalDiscountPrice += dishTotalPrice;
                 volume += dishTotalPrice * rate;
             });
+            if(order.type === OrderTypeEnum.Buffet) {
+                const buffetTotalPrice = calcBuffetTotalPrice(order.buffet.snapshot, order.adultNum, order.childNum)
+                totalDiscountPrice += buffetTotalPrice;
+                volume += buffetTotalPrice * rate;
+            }
             resultProcessArr.push({
                 type: process.type,
                 value: process.value,