@freedom_sky/feige-lib 4.51.3 → 4.51.5

package/dist/index.js

@@ -169,13 +169,19 @@ function calcReceivablePrice(order, processArr, noTax) {
             var rate_1 = -(10 - process.value) / 10;
             var volume_1 = 0;
             order.content.forEach(function (orderContentItem) {
+                var _a;
                 if (orderContentItem.dishSnapshot.noFullOrderDiscount) {
                     return;
                 }
-                var dishTotalPrice = orderContentItem.count * calcDishFinalPrice(orderContentItem);
+                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;
             });
+            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,
@@ -210,12 +216,12 @@ function calcReceivablePrice(order, processArr, noTax) {
     var taxObj = {};
     if (order.taxType === tax_enum_1.TaxTypeEnum.PriceNoTaxBindDish && !noTax) {
         order.content.forEach(function (orderContentItem) {
-            var _a;
+            var _a, _b;
             if (!orderContentItem.dishSnapshot.taxes || orderContentItem.dishSnapshot.taxes.length === 0) {
                 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 = orderContentItem.count * calcDishFinalPrice(orderContentItem);
+            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.3",
+  "version": "4.51.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -198,10 +198,15 @@ export function calcReceivablePrice(
                 if (orderContentItem.dishSnapshot.noFullOrderDiscount) {
                     return;
                 }
-                const dishTotalPrice = orderContentItem.count * calcDishFinalPrice(orderContentItem);
+                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)
+                totalDiscountPrice += buffetTotalPrice;
+                volume += buffetTotalPrice * rate;
+            }
             resultProcessArr.push({
                 type: process.type,
                 value: process.value,
@@ -240,7 +245,7 @@ export function calcReceivablePrice(
             const discountValue = sortedProcessArr.find(
                 (process) => process.type === CONST.RECEIVABLE_PROCESSING_TYPE.DISCOUNT.TYPE,
             )?.value;
-            let dishTotalPrice = orderContentItem.count * calcDishFinalPrice(orderContentItem);
+            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;