@pisell/pisellos 3.0.76 → 3.0.77

package/dist/modules/Payment/types.js

@@ -1,257 +1,33 @@
-/**
- * 支付相关类型定义
- */
-
-/**
- * 支付方式枚举
- */
-export var PaymentMethodType = /*#__PURE__*/function (PaymentMethodType) {
-  PaymentMethodType["Cash"] = "CASHMANUAL";
-  PaymentMethodType["Eftpos"] = "EFTPOS";
-  PaymentMethodType["Wallet"] = "WALLET";
-  return PaymentMethodType;
-}({});
-
-/**
- * 支付状态枚举
- */
-export var PaymentStatus = /*#__PURE__*/function (PaymentStatus) {
-  PaymentStatus["Processing"] = "payment_processing";
-  PaymentStatus["Sync"] = "sync";
-  PaymentStatus["PartiallyPaid"] = "partially_paid";
-  PaymentStatus["Finished"] = "finish";
-  return PaymentStatus;
-}({});
-
-/**
- * 任务状态枚举
- */
-export var TaskRunStatus = /*#__PURE__*/function (TaskRunStatus) {
-  TaskRunStatus["Pending"] = "pending";
-  TaskRunStatus["Running"] = "running";
-  TaskRunStatus["Success"] = "success";
-  TaskRunStatus["Failed"] = "failed";
-  return TaskRunStatus;
-}({});
-
-/**
- * 舍入规则枚举
- */
-export var RoundingRule = /*#__PURE__*/function (RoundingRule) {
-  RoundingRule["Standard"] = "standard_rounding";
-  RoundingRule["StandardDown"] = "standard_down";
-  RoundingRule["AlwaysUp"] = "always_up";
-  RoundingRule["AlwaysDown"] = "always_down";
-  return RoundingRule;
-}({});
-
-/**
- * 舍入结果
- */
-
-/**
- * 舍入间隔枚举
- */
-export var RoundingInterval = /*#__PURE__*/function (RoundingInterval) {
-  RoundingInterval[RoundingInterval["Interval005"] = 0.05] = "Interval005";
-  RoundingInterval[RoundingInterval["Interval01"] = 0.1] = "Interval01";
-  RoundingInterval[RoundingInterval["Interval05"] = 0.5] = "Interval05";
-  RoundingInterval[RoundingInterval["Interval1"] = 1] = "Interval1";
-  return RoundingInterval;
-}({});
-
-/**
- * 支付方式信息
- */
-
-/**
- * 支付项
- */
-
-/**
- * 订单信息
- */
-
-/**
- * 支付订单（简化版，仅保留支付相关信息）
- */
-
-/**
- * 支付状态
- */
-
-/**
- * 推送订单参数（简化版）
- */
-
-/**
- * 更新订单参数
- */
-
-/**
- * 支付项输入类型（允许 amount 为数字）
- */
-
-/**
- * 推送支付项参数
- */
-
-/**
- * 更新支付项参数中的字段类型（允许 amount 为数字）
- */
-
-/**
- * 更新支付项参数
- */
-
-/**
- * 删除支付项参数
- */
-
-/**
- * 现金支付接口
- */
+// import { Order } from '../Order/types'
 
-/**
- * Eftpos支付接口
- */
-
-/**
- * 钱包支付接口
- */
-
-/**
- * 支付模块API接口
- */
-
-/**
- * 订单变化事件数据
- */
-
-/**
- * 支付方式变化事件数据
- */
-
-/**
- * 支付同步错误事件数据
- */
-
-/**
- * 支付同步成功事件数据
- */
-
-/**
- * 钱包推荐列表更新事件数据
- */
-
-/**
- * 用户识别码列表更新事件数据
- */
-
-/**
- * 钱包缓存清除事件数据
- */
-
-/**
- * 搜索识别码完成事件数据
- */
-
-/**
- * 钱包初始化开始事件数据
- */
-
-/**
- * 钱包初始化完成事件数据
- */
-
-/**
- * 钱包初始化失败事件数据
- */
-
-/**
- * 钱包支付事件枚举
- */
-export var WalletPassHooks = /*#__PURE__*/function (WalletPassHooks) {
-  WalletPassHooks["OnWalletRecommendListUpdated"] = "wallet:onWalletRecommendListUpdated";
-  WalletPassHooks["OnWalletRecommendListCleared"] = "wallet:onWalletRecommendListCleared";
-  WalletPassHooks["OnUserIdentificationCodesUpdated"] = "wallet:onUserIdentificationCodesUpdated";
-  WalletPassHooks["OnUserIdentificationCodesCleared"] = "wallet:onUserIdentificationCodesCleared";
-  WalletPassHooks["OnWalletCacheCleared"] = "wallet:onWalletCacheCleared";
-  WalletPassHooks["OnSearchIdentificationCodeCompleted"] = "wallet:onSearchIdentificationCodeCompleted";
-  WalletPassHooks["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
-  WalletPassHooks["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
-  WalletPassHooks["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
-  return WalletPassHooks;
-}({});
-
-/**
- * 支付钩子事件（统一接口）
- */
 export var PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
-  PaymentHooks["OnPaymentMethodsLoaded"] = "payment:onPaymentMethodsLoaded";
-  PaymentHooks["OnPaymentMethodsChanged"] = "payment:onPaymentMethodsChanged";
-  PaymentHooks["OnOrderChanged"] = "payment:onOrderChanged";
-  PaymentHooks["OnOrderAdded"] = "payment:onOrderAdded";
-  PaymentHooks["OnOrderUpdated"] = "payment:onOrderUpdated";
-  PaymentHooks["OnOrderDeleted"] = "payment:onOrderDeleted";
-  PaymentHooks["OnPaymentAdded"] = "payment:onPaymentAdded";
-  PaymentHooks["OnPaymentUpdated"] = "payment:onPaymentUpdated";
-  PaymentHooks["OnPaymentDeleted"] = "payment:onPaymentDeleted";
-  PaymentHooks["OnPaymentSubmitted"] = "payment:onPaymentSubmitted";
-  PaymentHooks["OnOrderAmountChanged"] = "payment:onOrderAmountChanged";
-  PaymentHooks["OnPaymentSyncError"] = "payment:onPaymentSyncError";
-  PaymentHooks["OnPaymentSyncSuccess"] = "payment:onPaymentSyncSuccess";
-  PaymentHooks["OnWalletRecommendListUpdated"] = "wallet:onWalletRecommendListUpdated";
-  PaymentHooks["OnWalletRecommendListCleared"] = "wallet:onWalletRecommendListCleared";
-  PaymentHooks["OnUserIdentificationCodesUpdated"] = "wallet:onUserIdentificationCodesUpdated";
-  PaymentHooks["OnUserIdentificationCodesCleared"] = "wallet:onUserIdentificationCodesCleared";
-  PaymentHooks["OnWalletCacheCleared"] = "wallet:onWalletCacheCleared";
-  PaymentHooks["OnSearchIdentificationCodeCompleted"] = "wallet:onSearchIdentificationCodeCompleted";
+  PaymentHooks["OnPaymentInit"] = "payment:onPaymentInit";
+  PaymentHooks["OnPaymentSuccess"] = "payment:onPaymentSuccess";
+  PaymentHooks["OnPaymentFailure"] = "payment:onPaymentFailure";
+  PaymentHooks["OnPaymentRefund"] = "payment:onPaymentRefund";
   return PaymentHooks;
 }({});
 
 /**
- * 钱包推荐扣款请求参数
- */
-
-/**
- * 钱包初始化业务数据接口
- * 用于生成钱包API参数的必要业务信息
- */
-
-/**
- * 查询用户识别码列表请求参数
- */
-
-/**
- * 钱包推荐扣款响应数据
+ * 支付方式
  */
 
-/**
- * 用户识别码列表响应数据
- */
-
-/**
- * 用户识别码项目
- */
+// 银行转账
 
 /**
- * 搜索识别码请求参数
- * 基于 WalletDeductionRecommendParams 并增加 code 字段
+ * 支付状态
  */
 
-/**
- * 搜索识别码响应数据
- */
+// 已退款
 
 /**
- * 搜索识别码结果类型
+ * 支付信息
  */
 
 /**
- * 搜索识别码项目
+ * 支付模块状态
  */
 
 /**
- * 钱包推荐项目
+ * 支付模块 API
  */

package/dist/modules/ProductList/index.d.ts

@@ -11,17 +11,12 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
         cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
     }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
@@ -33,10 +28,4 @@ export declare class ProductList extends BaseModule implements Module {
     getProduct(id: number): Promise<ProductData | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-    findProductsByCodeOrBarcode(code: string): ProductData[];
 }

package/dist/modules/ProductList/index.js

@@ -16,6 +16,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
+import { ProductListHooks } from "./types";
 import { cloneDeep } from 'lodash-es';
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
@@ -86,11 +87,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
         var _this$otherParams;
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, cacheId, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$menu_list_ids = _ref.menu_list_ids, menu_list_ids = _ref$menu_list_ids === void 0 ? [] : _ref$menu_list_ids, paramsCustomerId = _ref.customer_id, _ref$with_count = _ref.with_count, with_count = _ref$with_count === void 0 ? [] : _ref$with_count, schedule_datetime = _ref.schedule_datetime, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId, with_schedule = _ref.with_schedule;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId;
               // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               // if (!schedule_ids?.length) {
               //   const schedule_ids_data = this.store.schedule
@@ -106,7 +107,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
-                customer_id = paramsCustomerId || (userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id);
+                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
               } catch (error) {
                 console.error(error);
               }
@@ -125,13 +126,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: cacheId,
-                menu_list_ids: menu_list_ids,
-                with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
                 application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
-                with_schedule: with_schedule,
-                schedule_datetime: schedule_datetime,
                 is_eject: 1
               }, {
                 useCache: true
@@ -140,16 +137,17 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              }); // if (sortedList.length) {
-              //   sortedList.forEach((n: any) => {
-              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-              //       n.is_eject = 1
-              //     }
-              //   })
-              // }
+              });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -200,7 +198,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onGetProducts"), this.store.list);
+              return this.core.effects.emit(ProductListHooks.onGetProducts, this.store.list);
             case 2:
               return _context5.abrupt("return", cloneDeep(this.store.list));
             case 3:
@@ -223,7 +221,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return this.core.effects.emit("".concat(this.name, ":onGetProduct"), this.store.list);
+              return this.core.effects.emit(ProductListHooks.onGetProduct, this.store.list);
             case 2:
               product = this.store.list.find(function (product) {
                 return product.id === id;
@@ -297,26 +295,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return selectProducts;
     }()
-    /**
-     * 根据商品编码或条码搜索商品
-     * @param code 商品编码或条码
-     * @returns 匹配的商品列表，如果没有匹配则返回空数组
-     */
-  }, {
-    key: "findProductsByCodeOrBarcode",
-    value: function findProductsByCodeOrBarcode(code) {
-      if (!code || typeof code !== 'string') {
-        return [];
-      }
-      var trimmedCode = code.trim();
-      if (!trimmedCode) {
-        return [];
-      }
-      var matchingProducts = this.store.list.filter(function (product) {
-        return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
-      });
-      return cloneDeep(matchingProducts);
-    }
   }]);
   return ProductList;
 }(BaseModule);

package/dist/modules/Resource/index.js

@@ -89,7 +89,7 @@ export var ResourceListModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               this.store.selectedResource = resource;
               _context3.next = 6;
-              return this.core.effects.emit("".concat(this.name, ":onResourceSelect"), resource);
+              return this.core.effects.emit(ResourceHooks.OnResourceSelect, resource);
             case 6:
             case "end":
               return _context3.stop();

package/dist/modules/Rules/index.d.ts

@@ -2,7 +2,6 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -36,7 +35,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
+        selectedList?: any[];
         scan?: boolean;
     }): DiscountResult;
     /**

package/dist/modules/Rules/index.js

@@ -24,14 +24,12 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
+import { RulesHooks } from "./types";
 import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime, isOrderLevelFixedAmountDiscount, calculateOrderLevelDiscountAllocation } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
-
-// 临时变量
-var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -76,7 +74,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.store.rulesList = rulesList;
               _context2.next = 3;
-              return this.core.effects.emit("".concat(this.name, ":onRulesListChange"), rulesList);
+              return this.core.effects.emit(RulesHooks.OnRulesListChange, rulesList);
             case 3:
             case "end":
               return _context2.stop();
@@ -454,7 +452,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         const priceB = new Decimal((bProduct.price as string) || '0');
         if (priceA.toNumber() === priceB.toNumber()) {
           if (aProduct.quantity === bProduct.quantity) {
-            return bProduct.discount_list?.length - aProduct.discount_list?.length;
+            return bProduct.discount_list?.length  - aProduct.discount_list?.length;
           }
           return aProduct.quantity - bProduct.quantity;
         }
@@ -696,6 +694,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         addModeDiscount.forEach(function (discount) {
           var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
+
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
@@ -718,7 +717,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -807,7 +806,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length) && (discount.tag || discount.type) === 'good_pass') return false;
 
           // 折扣卡商品价格为0时不可用
-          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
+          if ((Number(product.price) === 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
             var _n$discount;
             return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
@@ -938,7 +937,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+        if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (flatItem.type === 'main') {
             // 主商品：保持原有逻辑
             if (product.isClient) {
@@ -964,10 +963,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: product.price
-              } : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.origin_total || product.total,
                 price: product.price,
@@ -980,7 +976,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+              price: flatItem.bundleItem.original_price,
               processed: true
             })]);
           }
@@ -1420,18 +1416,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 var allDiscountAmount = getDiscountListAmountTotal(mainDiscountList);
                 newTotalWithDiscount = (_Decimal$minus$toNumb = new Decimal(mainProductData.price || 0).minus(allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb !== void 0 ? _Decimal$minus$toNumb : newTotalWithDiscount;
                 newOriginTotalWithDiscount = (_mainProductData$orig = mainProductData.origin_total) !== null && _mainProductData$orig !== void 0 ? _mainProductData$orig : newOriginTotalWithDiscount;
-              }
-
-              // 累加bundle的价格（只累加一次）
-              if (newBundleWithDiscount.length > 0) {
-                newBundleWithDiscount.forEach(function (item) {
-                  newTotalWithDiscount += Number(item.price) * Number(item.num);
-                });
-                newBundleWithDiscount.forEach(function (item) {
-                  var _item$discount_list2;
-                  var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
-                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-                });
+                if (newBundleWithDiscount.length > 0) {
+                  newBundleWithDiscount.forEach(function (item) {
+                    var _item$discount_list2;
+                    newTotalWithDiscount += Number(item.price) * Number(item.num);
+                    var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
+                    newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+                  });
+                }
               }
 
               // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1494,14 +1486,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   var _allDiscountAmount = getDiscountListAmount(mainDiscountListOriginal);
                   newTotalOriginal = (_Decimal$minus$toNumb2 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb2 !== void 0 ? _Decimal$minus$toNumb2 : newTotalOriginal;
                   newOriginTotalOriginal = (_mainProductData$orig2 = mainProductData.origin_total) !== null && _mainProductData$orig2 !== void 0 ? _mainProductData$orig2 : newOriginTotalOriginal;
-                }
-
-                // 累加bundle的价格（只累加一次）
-                if (newBundleOriginal.length > 0) {
-                  newBundleOriginal.forEach(function (item) {
-                    newTotalOriginal += Number(item.price) * Number(item.num);
-                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                  });
+                  if (newBundleOriginal.length > 0) {
+                    newBundleOriginal.forEach(function (item) {
+                      newTotalOriginal += Number(item.price) * Number(item.num);
+                      newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                    });
+                  }
                 }
 
                 // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1595,13 +1585,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                   // 累加bundle的价格（只累加一次）
                   if (newBundle.length > 0) {
-                    newBundle.forEach(function (item) {
-                      newTotal += Number(item.price) * Number(item.num);
-                    });
-
-                    // 计算原始总价（不考虑折扣）
                     newBundle.forEach(function (item) {
                       var _item$discount_list3;
+                      newTotal += Number(item.price) * Number(item.num);
                       var originalPrice = ((_item$discount_list3 = item.discount_list) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3[0]) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3.discount) === null || _item$discount_list3 === void 0 ? void 0 : _item$discount_list3.original_amount) || item.price;
                       newOriginTotal += Number(originalPrice) * Number(item.num);
                     });
@@ -1780,34 +1766,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 套餐中购买时，判断是否为原价
           var _priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
           var _priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
-
-          // original_price 对应：
-          // 1. price_type: "markup" && price_type_ext: "product_price"
-          // markup_price 对应：
-          // price_type: "markup" && price_type_ext: ""
-          /** 原价 */
-          var _isOriginalPrice = _priceType === 'markup' && _priceTypeExt === 'product_price';
-          /** 加价 */
-          var _isMarkupPrice = _priceType === 'markup' && (_priceTypeExt === '' || !_priceTypeExt);
-
-          // 检查 rules
-          if (rules.length > 0) {
-            // 检查原价
-            if (_isOriginalPrice && rules.includes('original_price')) {
-              return true;
-            }
-
-            // 检查加价
-            if (_isMarkupPrice && rules.includes('markup_price')) {
-              return true;
-            }
-
-            // 如果都不匹配，则不可用
-            return false;
-          }
-
           // 原价包括：price_type: "markup" && price_type_ext: "product_price"
-          return _isOriginalPrice;
+          return _priceType === 'markup' && _priceTypeExt === 'product_price';
         }
         return false;
       }
@@ -1876,7 +1836,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core.effects.offByModuleDestroy(this.name);
               _context3.next = 3;
-              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
+              return this.core.effects.emit(RulesHooks.OnDestroy, {});
             case 3:
               console.log('[Rules] 已销毁');
             case 4:

package/dist/modules/Rules/types.d.ts

@@ -44,7 +44,6 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     holder_id?: number | string;
-    vouchersApplicable?: boolean;
     startDate?: any;
 };
 export interface RulesParamsHooks {

package/dist/modules/Schedule/index.d.ts

@@ -25,13 +25,4 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
-    /**
-     * 传入一个时间, 判断改时间是否在schedule 内
-     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
-     * @returns
-     */
-    static isInScheduleByDate({ date, schedule, }: {
-        date: string;
-        schedule: any;
-    }): boolean | undefined;
 }