@freedom_sky/feige-lib 4.54.1 → 4.55.0

package/dist/index.d.ts

@@ -185,6 +185,7 @@ export declare function getLanguageFromCountryCode(countryCode: any): string;
  * 根据dishID返回已经下单的数量
  *
  * @param {Order} order  店铺
- * @returns {Number} 返回当前数量
+ * @param dishId
+ * @returns {number} 返回当前数量
  */
-export declare function getDishCountByIdInAllUncanceledTasks(order: Order, dishId: string): Number;
+export declare function getDishCountByIdInAllUncanceledTasks(order: Order, dishId: string): number;

package/dist/index.js

@@ -114,6 +114,8 @@ 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 (orderContentItem.retreated)
+        return 0;
     if (orderType === order_enum_1.OrderTypeEnum.Buffet) {
         var buffetDishItem = index_1.getDishItemInBuffet({ dishId: orderContentItem.dishSnapshot._id, buffet: buffetItem });
         if (buffetDishItem) {
@@ -167,6 +169,7 @@ exports.getOrderedCountByDishId = getOrderedCountByDishId;
  */
 function calcReceivablePrice(order, processArr, noTax) {
     if (noTax === void 0) { noTax = false; }
+    var _a;
     var totalDiscountPrice = 0;
     var resultProcessArr = [];
     var totalPrice = calcTotalPrice(order);
@@ -260,6 +263,16 @@ function calcReceivablePrice(order, processArr, noTax) {
                 taxObj[taxKey] = (taxObj[taxKey] || 0) + parseMoney(taxFare);
             });
         });
+        // 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 sharedMarkDown_1 = (totalMarkDown * buffetTotalPrice_1) / receivablePriceAfterDiscount;
+            order.buffet.taxes.forEach(function (tax) {
+                var taxFare = (buffetTotalPrice_1 - sharedMarkDown_1) * tax.rate;
+                var taxKey = tax.name + "(" + big_js_1.default(tax.rate).times(100) + "%)";
+                taxObj[taxKey] = (taxObj[taxKey] || 0) + parseMoney(taxFare);
+            });
+        }
     }
     else if (order.taxType === tax_enum_1.TaxTypeEnum.PriceHaveTaxBindOrder && !noTax) {
         var totalTaxRate_1 = 0;
@@ -519,13 +532,19 @@ exports.getLanguageFromCountryCode = getLanguageFromCountryCode;
  * 根据dishID返回已经下单的数量
  *
  * @param {Order} order  店铺
- * @returns {Number} 返回当前数量
+ * @param dishId
+ * @returns {number} 返回当前数量
  */
 function getDishCountByIdInAllUncanceledTasks(order, dishId) {
     var count = 0;
     if (order.tasks) {
-        count = order.tasks.filter(function (task) { return task.status !== const_1.CONST.STATUS.CANCELLED; }).reduce(function (count, task) {
-            return count + task.content.filter(function (item) { return String(item.dishSnapshot._id) === String(dishId); }).reduce(function (value, item) { return value + item.count; }, 0);
+        count = order.tasks
+            .filter(function (task) { return task.status !== const_1.CONST.STATUS.CANCELLED; })
+            .reduce(function (count, task) {
+            return (count +
+                task.content
+                    .filter(function (item) { return String(item.dishSnapshot._id) === String(dishId); })
+                    .reduce(function (value, item) { return value + item.count; }, 0));
         }, 0);
     }
     return count;

package/dist/interfaces/order/order.interface.d.ts

@@ -48,6 +48,10 @@ export interface Order {
     }[];
     readonly buffet?: {
         snapshot: BuffetCombosItems;
+        taxes: {
+            name: string;
+            rate: number;
+        }[];
     };
     readonly adultNum?: number;
     readonly childNum?: number;

package/package.json

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

package/src/index.ts

@@ -144,6 +144,7 @@ export function calcContentPrice({
     childNum: number;
     contents: Content[];
 }): number {
+    if (orderContentItem.retreated) return 0;
     if (orderType === OrderTypeEnum.Buffet) {
         const buffetDishItem = getDishItemInBuffet({ dishId: orderContentItem.dishSnapshot._id, buffet: buffetItem });
         if (buffetDishItem) {
@@ -178,10 +179,12 @@ export function calcContentPrice({
  */
 export function getOrderedCountByDishId(dishId, contents: Content[], beforeKey?: string): number {
     let count = 0;
-    for (const content of contents.filter((content) => !content.retreated && String(content.dishSnapshot._id) === String(dishId))) {
+    for (const content of contents.filter(
+        (content) => !content.retreated && String(content.dishSnapshot._id) === String(dishId),
+    )) {
         if (beforeKey && String(content._id) === String(beforeKey)) break;
         count += content.count;
-    } 
+    }
     return count;
 }
 
@@ -301,6 +304,16 @@ export function calcReceivablePrice(
                 taxObj[taxKey] = (taxObj[taxKey] || 0) + parseMoney(taxFare);
             });
         });
+        // buffet price
+        if (order.type === OrderTypeEnum.Buffet) {
+            const buffetTotalPrice = calcBuffetTotalPrice(order.buffet?.snapshot, order.adultNum, order.childNum);
+            const sharedMarkDown = (totalMarkDown * buffetTotalPrice) / receivablePriceAfterDiscount;
+            order.buffet.taxes.forEach((tax) => {
+                const taxFare = (buffetTotalPrice - sharedMarkDown) * tax.rate;
+                const taxKey = `${tax.name}(${Big(tax.rate).times(100)}%)`;
+                taxObj[taxKey] = (taxObj[taxKey] || 0) + parseMoney(taxFare);
+            });
+        }
     } else if (order.taxType === TaxTypeEnum.PriceHaveTaxBindOrder && !noTax) {
         let totalTaxRate = 0;
         order.priceHaveTaxBindOrderTaxes.forEach((item) => {
@@ -565,14 +578,22 @@ export function getLanguageFromCountryCode(countryCode): string {
  * 根据dishID返回已经下单的数量
  *
  * @param {Order} order  店铺
- * @returns {Number} 返回当前数量
+ * @param dishId
+ * @returns {number} 返回当前数量
  */
-export function getDishCountByIdInAllUncanceledTasks(order: Order, dishId: string): Number {
+export function getDishCountByIdInAllUncanceledTasks(order: Order, dishId: string): number {
     let count = 0;
     if (order.tasks) {
-        count = order.tasks.filter(task=>task.status!==CONST.STATUS.CANCELLED).reduce((count, task) => {
-            return count + task.content.filter(item=>String(item.dishSnapshot._id)===String(dishId)).reduce((value, item) => value+item.count,0);
-        },0);
+        count = order.tasks
+            .filter((task) => task.status !== CONST.STATUS.CANCELLED)
+            .reduce((count, task) => {
+                return (
+                    count +
+                    task.content
+                        .filter((item) => String(item.dishSnapshot._id) === String(dishId))
+                        .reduce((value, item) => value + item.count, 0)
+                );
+            }, 0);
     }
     return count;
-}
+}

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

@@ -48,6 +48,10 @@ export interface Order {
     }[];
     readonly buffet?: {
         snapshot: BuffetCombosItems;
+        taxes: {
+            name: string;
+            rate: number;
+        }[];
     };
     readonly adultNum?: number;
     readonly childNum?: number;