@pisell/pisellos 3.0.42 → 3.0.43

package/dist/solution/ShopDiscount/index.js

@@ -1,7 +1,5 @@
-var _excluded = ["wallet_pass_list"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -30,6 +28,7 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import Decimal from 'decimal.js';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -45,6 +44,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "options", {});
+    _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.store = {
       customer: null,
       productList: [],
@@ -59,12 +59,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _options$otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.options = options;
               this.store = _objectSpread(_objectSpread({}, this.store), options.store || {});
+              this.hooks = (_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 || (_options$otherParams = _options$otherParams.rules) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.hooks;
               console.log('[ShopDiscount] 初始化完成');
 
               // 获取依赖的插件
@@ -75,7 +77,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 注册事件监听
               this.registerEventListeners();
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -196,7 +198,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         _this2.loadPrepareConfig({
           customerId: customer.id,
           action: 'create',
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       });
     }
@@ -324,11 +327,23 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
             case 10:
+              if (resultDiscountList.length) {
+                _context5.next = 12;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "server",
+                isAvailable: false,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 12:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -344,37 +359,39 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 18;
+                _context5.next = 20;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 18;
+                _context5.next = 20;
                 break;
               }
-              _context5.next = 18;
+              _context5.next = 20;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 18:
+            case 20:
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 21:
-              _context5.prev = 21;
+            case 23:
+              _context5.prev = 23;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 25:
+            case 27:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 21]]);
+        }, _callee5, this, [[0, 23]]);
       }));
       function scanCode(_x4) {
         return _scanCode.apply(this, arguments);
@@ -429,25 +446,42 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
-      var _this$store$discount5;
+      var _this3 = this,
+        _this$store$discount5;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
         if (item.booking_id) {
+          var _this3$hooks;
+          var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && discount.type === 'good_pass') {
-              var _discount$discount, _discount$discount2, _discount$discount3;
-              editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
-                isEditMode: true,
-                limited_relation_product_data: {},
-                savedAmount: discount.amount,
-                isAvailable: true,
-                id: ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id,
-                format_title: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) || discount.format_title,
-                isDisabled: true,
-                isSelected: true,
-                product_id: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.product_id) || discount.product_id
-              }));
+            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+              var index = editModeDiscountList.findIndex(function (n) {
+                var _discount$discount;
+                return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
+              });
+              if (index !== -1) {
+                editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
+                  amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                });
+              } else {
+                var _discount$discount2, _discount$discount3, _discount$discount4;
+                if (discount.type && !discount.tag) {
+                  discount.tag = discount.type;
+                }
+                editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  isEditMode: true,
+                  limited_relation_product_data: {},
+                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
+                  isAvailable: true,
+                  id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
+                  format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
+                  isDisabled: true,
+                  isSelected: true,
+                  product_id: ((_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.product_id) || discount.product_id
+                }));
+              }
             }
           });
         }
@@ -455,6 +489,40 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
       })));
+      var allUsedProductIds = newDiscountList.map(function (n) {
+        var _n$appliedProductDeta;
+        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+          var _n$discount;
+          return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
+        }) : [];
+      }).flat();
+      newDiscountList.forEach(function (item) {
+        var _item$applicableProdu;
+        var isProductFree = function isProductFree(id) {
+          var _this3$hooks2;
+          var targetProduct = productList.find(function (n) {
+            return n.id === id;
+          });
+          var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
+          return Number(product === null || product === void 0 ? void 0 : product.total) === 0;
+        };
+        var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
+          var _item$applicableProdu2;
+          // 检查当前 id是否在 item.applicableProductIds 里出现了几次，且要求次数和 item.applicableProductIds 里出现的次数一致
+          var sameIdTimes = ((_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.filter(function (n) {
+            return n === id;
+          }).length) || 1;
+          var targetIdTimes = (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.filter(function (n) {
+            return n === id;
+          }).length) || 0;
+          return targetIdTimes >= sameIdTimes || isProductFree(id);
+        });
+        if (!item.isSelected && isAllProductUsedOrFree) {
+          item.isDisabledForProductUsed = true;
+        } else {
+          item.isDisabledForProductUsed = false;
+        }
+      });
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
@@ -473,14 +541,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var result, _result$data, wallet_pass_list, customer;
+        var result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.prev = 0;
               _context7.next = 3;
-              return this.request.get("/customer/info/wallet/".concat(id), {
-                wallet_pass_tags: ['good_pass']
+              return this.request.get("/customer/info/".concat(id), {
+                with_trashed: 1
               });
             case 3:
               result = _context7.sent;
@@ -488,7 +556,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 _context7.next = 9;
                 break;
               }
-              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
               this.setCustomer(customer);
               _context7.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
@@ -514,7 +582,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, newDiscountList, result;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -526,37 +594,44 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
-                with_good_pass: 1
+                with_good_pass: 1,
+                with_discount_card: 1
               });
             case 4:
               goodPassList = _context8.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
+              }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
+              scanDiscountIds = scanDiscount.map(function (n) {
+                return n.id;
+              });
+              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
+                return !scanDiscountIds.includes(n.id);
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(goodPassList || []));
+              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
               this.setDiscountList(newDiscountList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 12;
+                _context8.next = 14;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 12;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 12:
               _context8.next = 14;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
             case 14:
-              _context8.next = 19;
-              break;
+              _context8.next = 16;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
             case 16:
-              _context8.prev = 16;
+              _context8.next = 21;
+              break;
+            case 18:
+              _context8.prev = 18;
               _context8.t0 = _context8["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
-            case 19:
+            case 21:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 16]]);
+        }, _callee8, this, [[0, 18]]);
       }));
       function loadPrepareConfig(_x7) {
         return _loadPrepareConfig.apply(this, arguments);

package/lib/modules/AccountList/index.js

@@ -179,6 +179,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     });
   }
   async removeAccount(id) {
+    var _a;
     try {
       this.store.isLoading = true;
       this.store.error = null;
@@ -194,6 +195,9 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
+      if (!this.getActiveAccount() || ((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id || this.store.accounts.length === 1) {
+        this.setActiveAccount(this.store.accounts[0].getId());
+      }
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
         this.store

package/lib/modules/Cart/index.d.ts

@@ -1,6 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
+import { Account } from '../Account';
 export * from './types';
 /**
  * 购物车模块实现
@@ -67,4 +68,17 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     clear(): void;
     storeChange(): void;
     checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
+    /**
+     * 基于rowkey 合并商品，目前只有普通商品需要合并
+     *
+     * @param {string} rowKey
+     * @param {number} quantity
+     * @return {*}
+     * @memberof CartModule
+     */
+    mergeCartItemByRowKey(params: {
+        rowKey?: string;
+        quantity?: number;
+        account?: Account;
+    }): boolean;
 }

package/lib/modules/Cart/index.js

@@ -27,6 +27,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
+var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -157,7 +158,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
         bundle,
         options,
         product_variant_id: newProduct.product_variant_id,
-        quantity
+        quantity,
+        discounts
       });
     }
     if (discounts) {
@@ -310,6 +312,37 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     return result;
   }
+  /**
+   * 基于rowkey 合并商品，目前只有普通商品需要合并
+   *
+   * @param {string} rowKey
+   * @param {number} quantity
+   * @return {*} 
+   * @memberof CartModule
+   */
+  mergeCartItemByRowKey(params) {
+    const { rowKey, quantity, account } = params;
+    let flag = false;
+    const cartItems = this.getItems();
+    const targetCartItem = cartItems.find(
+      (n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      }
+    );
+    const isSameAccount = (account == null ? void 0 : account.id) === (targetCartItem == null ? void 0 : targetCartItem.holder_id);
+    if (rowKey && targetCartItem && (0, import_utils2.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {
+      this.updateItem({
+        _id: targetCartItem._id,
+        product: {
+          ...targetCartItem._productOrigin,
+          quantity: (targetCartItem.num || 1) + (quantity || 1)
+        }
+      });
+      flag = true;
+    }
+    return flag;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -20,6 +20,7 @@ export declare const formatProductToCartItem: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    discounts?: any[];
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -40,6 +41,7 @@ export declare const getProductTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number;
 /**
  * 获取商品原始总价
@@ -52,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -51,7 +51,9 @@ var handleVariantProduct = (product) => {
     );
     if (targetVariant) {
       product.price = targetVariant.price;
-      product.original_price = targetVariant.original_price;
+      if (Number(targetVariant.original_price) > 0) {
+        product.original_price = targetVariant.original_price;
+      }
       product.is_charge_tax = targetVariant.is_charge_tax;
     }
   }
@@ -65,7 +67,8 @@ var formatProductToCartItem = (params) => {
     bundle,
     options,
     product_variant_id,
-    quantity = 1
+    quantity = 1,
+    discounts
   } = params;
   const num = quantity;
   if (product) {
@@ -73,13 +76,14 @@ var formatProductToCartItem = (params) => {
     cartItem.name = product == null ? void 0 : product.title;
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
-    cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.total = getProductTotalPrice({ product, bundle, options, num, discounts });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
       bundle,
       options,
-      num
+      num,
+      discounts
     });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
@@ -163,7 +167,7 @@ var formatProductToCartItemOrigin = (params) => {
   return origin;
 };
 var getProductTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -175,13 +179,21 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
+  if (discounts == null ? void 0 : discounts.length) {
+    discounts.forEach((currentValue) => {
+      if (currentValue.type !== "good_pass") {
+        const discountPrice = new import_decimal.default(100).minus(currentValue.discount.percent || 0).div(100).mul(new import_decimal.default(price || 0)).toFixed(2);
+        price = Number(discountPrice);
+      }
+    });
+  }
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts == null ? void 0 : discounts.length)) {
     return void 0;
   }
   if (bundle == null ? void 0 : bundle.length) {
@@ -194,7 +206,7 @@ var getProductOriginTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var formatOptions = (options) => {
   if (!(options == null ? void 0 : options.length))

package/lib/modules/Date/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Date/index.ts
@@ -24,6 +34,7 @@ __export(Date_exports, {
 module.exports = __toCommonJS(Date_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
+var import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
 var DateModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -58,15 +69,61 @@ var DateModule = class extends import_BaseModule.BaseModule {
     return this.store.dateRange;
   }
   async getResourceDates(params) {
+    var _a;
+    if (params.useCache) {
+      const currentDateList = this.getDateList() || [];
+      const currentDateListMap = new Map(
+        currentDateList.map((item) => [item.date, item])
+      );
+      const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
+      const hasResource = resourceIds.every((id) => {
+        var _a2;
+        const currentItem = currentDateListMap.get(id.toString());
+        return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
+      });
+      if (hasResource) {
+        return currentDateList;
+      }
+    }
     const dates = await this.getResourceAvailableTimeList(params);
-    this.store.dateList = dates;
+    this.setDateList(dates);
     return dates;
   }
   getDateList() {
     return this.store.dateList;
   }
   setDateList(dateList) {
-    this.store.dateList = dateList;
+    const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
+    dateList.forEach((item) => {
+      var _a, _b;
+      const currentItemIndex = currentDateList.findIndex(
+        (n) => n.date === item.date
+      );
+      if (currentItemIndex !== -1) {
+        const currentItem = currentDateList[currentItemIndex];
+        const newResource = (_a = item.resource) == null ? void 0 : _a.filter(
+          (n) => {
+            var _a2;
+            return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
+          }
+        );
+        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
+          var _a2;
+          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
+          if (newResource2) {
+            n.times = newResource2.times;
+          }
+        });
+        currentItem.resource = [
+          ...currentItem.resource || [],
+          ...newResource || []
+        ];
+        currentDateList[currentItemIndex] = currentItem;
+      } else {
+        currentDateList.push(item);
+      }
+    });
+    this.store.dateList = currentDateList;
   }
   async fetchResourceDates(params) {
     const { url, query, useCache = true } = params;

package/lib/modules/Discount/index.d.ts

@@ -17,6 +17,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;
+        with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
     batchSearch(code: string): Promise<Discount[]>;