@freedom_sky/feige-lib 4.54.0 → 4.54.2

package/dist/index.d.ts

@@ -187,4 +187,4 @@ export declare function getLanguageFromCountryCode(countryCode: any): string;
  * @param {Order} order  店铺
  * @returns {Number} 返回当前数量
  */
-export declare function getDishCountById(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) {
@@ -147,7 +149,7 @@ exports.calcContentPrice = calcContentPrice;
  */
 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++) {
+    for (var _i = 0, _a = contents.filter(function (content) { return !content.retreated && String(content.dishSnapshot._id) === String(dishId); }); _i < _a.length; _i++) {
         var content = _a[_i];
         if (beforeKey && String(content._id) === String(beforeKey))
             break;
@@ -521,7 +523,7 @@ exports.getLanguageFromCountryCode = getLanguageFromCountryCode;
  * @param {Order} order  店铺
  * @returns {Number} 返回当前数量
  */
-function getDishCountById(order, dishId) {
+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) {
@@ -530,4 +532,4 @@ function getDishCountById(order, dishId) {
     }
     return count;
 }
-exports.getDishCountById = getDishCountById;
+exports.getDishCountByIdInAllUncanceledTasks = getDishCountByIdInAllUncanceledTasks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freedom_sky/feige-lib",
-  "version": "4.54.0",
+  "version": "4.54.2",
   "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,10 @@ export function calcContentPrice({
  */
 export function getOrderedCountByDishId(dishId, contents: Content[], beforeKey?: string): number {
     let count = 0;
-    for (const content of contents.filter((content) => 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;
 }
 
@@ -567,7 +568,7 @@ export function getLanguageFromCountryCode(countryCode): string {
  * @param {Order} order  店铺
  * @returns {Number} 返回当前数量
  */
-export function getDishCountById(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) => {