@freedom_sky/feige-lib 4.55.0 → 4.56.0

package/dist/const/const.d.ts

@@ -218,6 +218,7 @@ declare class Const {
         CHANGE_ORDER_OPERATOR: string;
         CHANGE_TABLE: string;
         MERGE_TABLE: string;
+        CHANGE_PEOPLE: string;
         WAITER_OFFLINE_CHANGE_ORDER_OPERATOR: string;
         WAITER_OFFLINE_CHANGE_ORDER_OPERATOR_FINISHED: string;
         WAITER_ONLINE_CHANGE_ORDER_OPERATOR_FINISHED: string;

package/dist/const/const.js

@@ -370,6 +370,7 @@ var Const = /** @class */ (function () {
             CHANGE_ORDER_OPERATOR: 'changeOrderOperator',
             CHANGE_TABLE: 'changeTable',
             MERGE_TABLE: 'mergeTable',
+            CHANGE_PEOPLE: 'changePeople',
             WAITER_OFFLINE_CHANGE_ORDER_OPERATOR: 'waiterOfflineChangeOrderOperator',
             WAITER_OFFLINE_CHANGE_ORDER_OPERATOR_FINISHED: 'waiterOfflineChangeOrderOperatorFinished',
             WAITER_ONLINE_CHANGE_ORDER_OPERATOR_FINISHED: 'waiterOnlineChangeOrderOperatorFinished',

package/dist/index.js

@@ -169,7 +169,7 @@ exports.getOrderedCountByDishId = getOrderedCountByDishId;
  */
 function calcReceivablePrice(order, processArr, noTax) {
     if (noTax === void 0) { noTax = false; }
-    var _a;
+    var _a, _b;
     var totalDiscountPrice = 0;
     var resultProcessArr = [];
     var totalPrice = calcTotalPrice(order);
@@ -265,7 +265,12 @@ function calcReceivablePrice(order, processArr, noTax) {
         });
         // buffet price
         if (order.type === order_enum_1.OrderTypeEnum.Buffet) {
-            var buffetTotalPrice_1 = index_1.calcBuffetTotalPrice((_a = order.buffet) === null || _a === void 0 ? void 0 : _a.snapshot, order.adultNum, order.childNum);
+            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 buffetTotalPrice_1 = index_1.calcBuffetTotalPrice((_b = order.buffet) === null || _b === void 0 ? void 0 : _b.snapshot, order.adultNum, order.childNum);
+            if (discountValue) {
+                var rate = -(10 - discountValue) / 10;
+                buffetTotalPrice_1 += buffetTotalPrice_1 * rate;
+            }
             var sharedMarkDown_1 = (totalMarkDown * buffetTotalPrice_1) / receivablePriceAfterDiscount;
             order.buffet.taxes.forEach(function (tax) {
                 var taxFare = (buffetTotalPrice_1 - sharedMarkDown_1) * tax.rate;

package/package.json

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

package/src/const/const.ts

@@ -368,6 +368,7 @@ class Const {
         CHANGE_ORDER_OPERATOR: 'changeOrderOperator',
         CHANGE_TABLE: 'changeTable',
         MERGE_TABLE: 'mergeTable',
+        CHANGE_PEOPLE: 'changePeople', // 修改订单人数
         WAITER_OFFLINE_CHANGE_ORDER_OPERATOR: 'waiterOfflineChangeOrderOperator', // 该动作会触发多次，通常保持静默
         WAITER_OFFLINE_CHANGE_ORDER_OPERATOR_FINISHED: 'waiterOfflineChangeOrderOperatorFinished',
         WAITER_ONLINE_CHANGE_ORDER_OPERATOR_FINISHED: 'waiterOnlineChangeOrderOperatorFinished',

package/src/index.ts

@@ -306,7 +306,14 @@ export function calcReceivablePrice(
         });
         // buffet price
         if (order.type === OrderTypeEnum.Buffet) {
-            const buffetTotalPrice = calcBuffetTotalPrice(order.buffet?.snapshot, order.adultNum, order.childNum);
+            const discountValue = sortedProcessArr.find(
+                (process) => process.type === CONST.RECEIVABLE_PROCESSING_TYPE.DISCOUNT.TYPE,
+            )?.value;
+            let buffetTotalPrice = calcBuffetTotalPrice(order.buffet?.snapshot, order.adultNum, order.childNum);
+            if (discountValue) {
+                const rate = -(10 - discountValue) / 10;
+                buffetTotalPrice += buffetTotalPrice * rate;
+            }
             const sharedMarkDown = (totalMarkDown * buffetTotalPrice) / receivablePriceAfterDiscount;
             order.buffet.taxes.forEach((tax) => {
                 const taxFare = (buffetTotalPrice - sharedMarkDown) * tax.rate;