@pisell/pisellos 0.0.413 → 0.0.415

package/dist/modules/Rules/index.js

@@ -155,8 +155,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      // 保留之前扫码得到的商品券（isScan: true）
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
-        return !discount.isEditMode && discount.tag !== 'good_pass';
+        return !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan);
       });
       var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({

package/dist/modules/Summary/utils.js

@@ -1024,12 +1024,12 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
     var productCount = matchedItems.reduce(function (total, item) {
       if (item.isMain) {
         // 主商品和addons商品
-        return total + (item.num || 1);
+        return total + (item.num || item.quantity || 1);
       } else {
         // 子商品（bundle item）和加时商品
         // 加时商品的 mainQuantity = 1，所以不受影响
         // bundle item 的 mainQuantity = 主商品数量，需要乘以实际数量
-        return total + (item.num || 1) * (item.mainQuantity || 1);
+        return total + (item.num || item.quantity || 1) * (item.mainQuantity || 1);
       }
     }, 0);
 

package/lib/modules/Rules/index.js

@@ -103,7 +103,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       };
     }
     const filteredOldDiscountList = oldDiscountList.filter(
-      (discount) => !discount.isEditMode && discount.tag !== "good_pass"
+      (discount) => !discount.isEditMode && (discount.tag !== "good_pass" || discount.isScan)
     );
     const mergedDiscountList = (0, import_utils.uniqueById)(
       (0, import_utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]),

package/lib/modules/Summary/utils.js

@@ -634,9 +634,9 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
     let finalAmount = 0;
     const productCount = matchedItems.reduce((total, item) => {
       if (item.isMain) {
-        return total + (item.num || 1);
+        return total + (item.num || item.quantity || 1);
       } else {
-        return total + (item.num || 1) * (item.mainQuantity || 1);
+        return total + (item.num || item.quantity || 1) * (item.mainQuantity || 1);
       }
     }, 0);
     let fixedTotal = new import_decimal.default(0);

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.413",
+  "version": "0.0.415",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",