@pisell/pisellos 3.0.4 → 3.0.6

package/dist/modules/Order/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 { generateDuration } from "./utils";
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -23,8 +24,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     var _this;
     _classCallCheck(this, OrderModule);
     _this = _super.call(this, name, version);
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "order");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'order');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     return _this;
@@ -38,7 +39,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
-              this.request = this.core.getPlugin("request");
+              this.request = this.core.getPlugin('request');
             case 3:
             case "end":
               return _context.stop();
@@ -54,46 +55,74 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrder",
     value: function createOrder(params) {
       var order = {
-        type: "appointment_booking",
-        platform: "H5",
-        sales_channel: "my_pisel",
-        order_sales_channel: "online_store",
+        type: 'appointment_booking',
+        platform: 'H5',
+        sales_channel: 'my_pisel',
+        order_sales_channel: 'online_store',
         bookings: [],
-        shop_note: "",
-        schedule_date: ""
+        shop_note: '',
+        schedule_date: '',
+        is_deposit: 0
       };
+      var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
+          if (!item._origin.duration) {
+            var _generateDuration = generateDuration(item),
+              duration = _generateDuration.duration,
+              durationType = _generateDuration.durationType;
+            item._origin.duration = duration;
+            item._origin.sub_type = durationType;
+          }
           order.bookings.push(item._origin);
+          if (item !== null && item !== void 0 && item.deposit) {
+            is_deposit = 1;
+          }
         });
         var firstCartItem = params.cartItems[0];
-        order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+        order.schedule_date = firstCartItem.start_date + ' ' + firstCartItem.start_time + ':00';
+        order.is_deposit = is_deposit;
       }
       return order;
     }
   }, {
-    key: "commitOrder",
+    key: "checkBeforeSubmitOrder",
+    value: function checkBeforeSubmitOrder(params) {
+      var cartItems = params.cartItems,
+        type = params.type;
+      if (type === 'holder') {
+        // 判断cartItems中是否有不存在holder_id的商品，如果有则返回false
+        var hasNoHolderId = cartItems.some(function (item) {
+          return !item.holder_id;
+        });
+        if (hasNoHolderId) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }, {
+    key: "submitOrder",
     value: function () {
-      var _commitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(order) {
         var url, query, fetchUrl, params;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               url = order.url, query = order.query;
-              fetchUrl = url || "/order/appointment";
+              fetchUrl = url || '/order/appointment';
               params = this.createOrder(query);
-              console.log(params);
               return _context2.abrupt("return", this.request.post(fetchUrl, params));
-            case 5:
+            case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function commitOrder(_x3) {
-        return _commitOrder.apply(this, arguments);
+      function submitOrder(_x3) {
+        return _submitOrder.apply(this, arguments);
       }
-      return commitOrder;
+      return submitOrder;
     }()
   }]);
   return OrderModule;

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

@@ -1,4 +1,4 @@
-import { CartItem } from "../Cart/types";
+import { CartItem } from '../Cart/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -25,10 +25,17 @@ export interface OrderModuleAPI {
      * @param params 订单信息
      * @returns 订单信息
      */
-    createOrder: (params: CommitOrderParams["query"]) => any;
+    createOrder: (params: CommitOrderParams['query']) => any;
+    /**
+     * 检查购物车提交订单前是否符合条件
+     */
+    checkBeforeSubmitOrder: (params: {
+        cartItems: CartItem[];
+        type: 'holder' | 'account';
+    }) => boolean;
     /**
      * 提交订单
      * @param params 订单信息
      */
-    commitOrder: (params: CommitOrderParams) => Promise<void>;
+    submitOrder: (params: CommitOrderParams) => Promise<void>;
 }

package/dist/modules/Order/utils.d.ts

@@ -0,0 +1,10 @@
+import { CartItem } from "../Cart";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export declare const generateDuration: (cartItem: CartItem) => {
+    duration: number;
+    durationType: string;
+};

package/dist/modules/Order/utils.js

@@ -0,0 +1,15 @@
+import dayjs from "dayjs";
+/**
+ * 通过 session 类商品的开始时间结束时间生成商品的时长
+ * @param {CartItem} cartItem
+ * @return {*}
+ */
+export var generateDuration = function generateDuration(cartItem) {
+  var startDate = dayjs("".concat(cartItem.start_date, " ").concat(cartItem.start_time));
+  var endDate = dayjs("".concat(cartItem.end_date, " ").concat(cartItem.end_time));
+  var duration = endDate.diff(startDate, 'minutes');
+  return {
+    duration: duration,
+    durationType: 'minutes'
+  };
+};

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

@@ -2,16 +2,26 @@ import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { ProductData, ProductMedia, ProductTag, ProductCategory, ProductBundleGroup } from './types';
 export * from './types';
+/**
+ * 商品详情模块
+ * 除了跟商品列表模块组合外，还会提供单独的商品详情页的一些方法
+ *
+ * @export
+ * @class Product
+ * @extends {BaseModule}
+ * @implements {Module}
+ */
 export declare class Product extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    protected otherParams: any;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
      * 获取商品数据
      */
-    getData(): ProductData | null;
+    getData(): ProductData;
     /**
      * 获取商品ID
      */
@@ -36,4 +46,7 @@ export declare class Product extends BaseModule implements Module {
      * 获取商品分类
      */
     getCategories(): ProductCategory[];
+    setOtherParams(key: string, value: any): void;
+    getOtherParams(): any;
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Product/index.js

@@ -17,6 +17,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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";
 export * from "./types";
+
+/**
+ * 商品详情模块
+ * 除了跟商品列表模块组合外，还会提供单独的商品详情页的一些方法
+ *
+ * @export
+ * @class Product
+ * @extends {BaseModule}
+ * @implements {Module}
+ */
 export var Product = /*#__PURE__*/function (_BaseModule) {
   _inherits(Product, _BaseModule);
   var _super = _createSuper(Product);
@@ -27,6 +37,9 @@ export var Product = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'product');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {
+      scheduler: []
+    });
     return _this;
   }
   _createClass(Product, [{
@@ -113,6 +126,28 @@ export var Product = /*#__PURE__*/function (_BaseModule) {
     value: function getCategories() {
       return this.store.categories;
     }
+  }, {
+    key: "setOtherParams",
+    value: function setOtherParams(key, value) {
+      this.otherParams[key] = value;
+    }
+  }, {
+    key: "getOtherParams",
+    value: function getOtherParams() {
+      return this.otherParams;
+    }
+  }, {
+    key: "getProductType",
+    value: function getProductType() {
+      var _this$store$schedule;
+      if (this.store.duration) {
+        return 'duration';
+      }
+      if ((_this$store$schedule = this.store['schedule.ids']) !== null && _this$store$schedule !== void 0 && _this$store$schedule.length) {
+        return 'session';
+      }
+      return 'normal';
+    }
   }]);
   return Product;
 }(BaseModule);

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

@@ -17,7 +17,7 @@ export interface ProductData {
     /** 商品slug */
     slug: string;
     /** draft:草稿;published:已发布;pending:待发布;archived:已归档 */
-    status: "draft" | "published" | "pending" | "archived";
+    status: 'draft' | 'published' | 'pending' | 'archived';
     /** 库存数量 */
     stock_quantity: number;
     /** 销售数量 */
@@ -152,6 +152,30 @@ export interface ProductData {
     options?: any[];
     /** 商品原信息 */
     origin?: any;
+    /** 容量 */
+    capacity?: any;
+    /** 商品套餐 */
+    product_bundle?: any;
+    /** 日程ids */
+    'schedule.ids'?: number[];
+    /** 商品日程信息，前端临时用，随时需要回收的 */
+    _schedule?: any;
+    /** 商品定金信息 */
+    custom_deposit_data?: {
+        /** 商品是否包含定金 1:是 0:否 */
+        has_deposit: 0 | 1;
+        /** 定金固定金额 */
+        deposit_fixed?: string;
+        /** 定金百分比 */
+        deposit_percentage?: string;
+        /** 定金协议数据 */
+        deposit_policy_data?: Array<{
+            /** 定金协议id */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }>;
+    };
 }
 /**
  * 商品媒体信息接口
@@ -414,7 +438,7 @@ export interface ProductResourceItem {
     /** 资源标题 */
     title: string;
     /** 资源编码 */
-    code: "resource";
+    code: 'resource';
     /** 默认资源 */
     default_resource?: number[];
     /** 可选资源 */
@@ -423,7 +447,7 @@ export interface ProductResourceItem {
     resource_type_id: number;
     /** 选择类型 */
     select_type?: {
-        type: "single";
+        type: 'single';
         min: 1;
         max: 1;
     };

package/dist/modules/ProductList/index.js

@@ -42,16 +42,22 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _options$initialState;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
               this.store = options.store;
-              this.store.productMap = new Map();
-              this.store.list = [];
-              this.store.selectProducts = [];
-              this.storeChange();
-            case 6:
+              if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
+                this.store.list = options.initialState.list;
+                this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
+                this.storeChange();
+              } else {
+                this.store.list = [];
+                this.store.productMap = new Map();
+                this.store.selectProducts = [];
+              }
+            case 3:
             case "end":
               return _context.stop();
           }

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

@@ -26,6 +26,7 @@ export interface Resource {
     startTime?: string;
     endTime?: string;
     resourceType?: string;
+    children?: Resource[];
 }
 /**
  * 资源列表状态

package/dist/modules/Resource/utils.js

@@ -1,6 +1,6 @@
 /**
  * @title: 获取资源map
- * @description: 
+ * @description:
  * @param {any} resourceList
  * @return {*}
  * @Author: zhiwei.Wang

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

@@ -1,6 +1,6 @@
-import { Module, PisellCore, ModuleOptions } from "../../types";
-import { BaseModule } from "../BaseModule";
-import { Rules, RulesModuleAPI, DiscountResult } from "./types";
+import { Module, PisellCore, ModuleOptions } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;

package/dist/modules/Rules/index.js

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
+import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -33,8 +34,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     var _this;
     _classCallCheck(this, RulesModule);
     _this = _super.call(this, name, version);
-    _defineProperty(_assertThisInitialized(_this), "defaultName", "rules");
-    _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
+    _defineProperty(_assertThisInitialized(_this), "defaultName", 'rules');
+    _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.hooks = {};
@@ -175,8 +176,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var sortedProductList = _toConsumableArray(productList).sort(function (a, b) {
         var aProduct = _this3.hooks.getProduct(a);
         var bProduct = _this3.hooks.getProduct(b);
-        var priceA = parseFloat(aProduct.price || "0");
-        var priceB = parseFloat(bProduct.price || "0");
+        var priceA = parseFloat(aProduct.price || '0');
+        var priceB = parseFloat(bProduct.price || '0');
         return priceB - priceA;
       });
 
@@ -209,7 +210,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
 
           // 是符合折扣的商品
-          var isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
+          var isLimitedProduct = limitedData.type === 'product_all' || limitedData.product_ids && limitedData.product_ids.includes(product.id);
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
@@ -256,7 +257,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
-          if (limitedData.type === "product_all") {
+          if (limitedData.type === 'product_all') {
             return true;
           } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
             return true;
@@ -268,7 +269,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length);
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length);
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {
@@ -277,55 +278,122 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         if (applicableDiscounts.length === 0 || isManualDiscount) {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-            total: product.origin_total || product.total,
-            price: product.price
-          }), {}, {
-            discount_list: []
-          })));
-          return;
-        }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
-          return;
-        }
+          if (product.isClient) {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: product.price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+          } else {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              total: product.origin_total || product.total,
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+            return;
+          }
+          if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+            return;
+          }
 
-        // 标记优惠券为已使用
-        usedDiscounts.set(selectedDiscount.id, true);
-
-        // 记录实际应用了优惠券的商品信息
-        var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-        var discountDetail = {
-          amount: product.price,
-          type: selectedDiscount.tag,
-          discount: {
-            resource_id: selectedDiscount.id,
-            title: selectedDiscount.format_title,
-            original_amount: product.origin_total,
-            product_id: selectedDiscount.product_id
+          // 标记优惠券为已使用
+          usedDiscounts.set(selectedDiscount.id, true);
+
+          // 记录实际应用了优惠券的商品信息
+          var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+          var discountDetail = {
+            amount: product.price,
+            type: selectedDiscount.tag,
+            discount: {
+              resource_id: selectedDiscount.id,
+              title: selectedDiscount.format_title,
+              original_amount: product.origin_total,
+              product_id: selectedDiscount.product_id
+            }
+          };
+          appliedProducts.push(discountDetail);
+          appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+
+          // 记录应用了优惠券的商品
+          // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
+          if (product.isClient) {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              price: 0,
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: '0'
+                },
+                bundle: product.bundle,
+                options: product.options
+              })
+            }));
+          } else {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              price: 0,
+              total: (product.origin_total || product.total) - product.price,
+              origin_total: product.origin_total || product.total
+            }));
           }
-        };
-        appliedProducts.push(discountDetail);
-        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-
-        // 记录应用了优惠券的商品
-        // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
-        processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
-          discount_list: [discountDetail],
-          price: 0,
-          total: (product.origin_total || product.total) - product.price,
-          origin_total: product.origin_total || product.total
-        }));
+        }
       });
 
       // 按原始顺序构建处理后的商品列表
       var processedProductList = productList.map(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
-        return processedProductsMap.get(product._id) || _this3.hooks.setProduct(originProduct, {
-          discount_list: [],
-          total: product.total,
-          origin_total: product.origin_total,
-          price: product.price
-        });
+        var getDefaultProduct = function getDefaultProduct() {
+          if (product.isClient) {
+            _this3.hooks.setProduct(originProduct, {
+              discount_list: [],
+              price: product.price,
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: product.price
+                },
+                bundle: product.bundle,
+                options: product.options
+              })
+            });
+          } else {
+            _this3.hooks.setProduct(originProduct, {
+              discount_list: [],
+              total: product.total,
+              origin_total: product.origin_total,
+              price: product.price
+            });
+          }
+        };
+        return processedProductsMap.get(product._id) || getDefaultProduct();
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券
@@ -343,7 +411,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var isAvailable = applicableProducts.length > 0;
 
         // 如果此优惠券被明确设置为不选中，保持其状态，但正确设置isAvailable
-        if (typeof discount.isSelected === "boolean" && discount.isSelected === false && discount.isManualSelect) {
+        if (typeof discount.isSelected === 'boolean' && discount.isSelected === false && discount.isManualSelect) {
           return _objectSpread(_objectSpread({}, discount), {}, {
             isSelected: false,
             isAvailable: isAvailable,
@@ -368,7 +436,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             appliedProductDetails: appliedProductDetails
           });
         }
-        var isSelected = typeof discount.isSelected === "boolean" ? discount.isSelected : undefined;
+        var isSelected = typeof discount.isSelected === 'boolean' ? discount.isSelected : undefined;
 
         // 如果是可用的 并且没有手动标记 则设置为选中
         if (isAvailable && appliedProductDetails.length && !discount.isManualSelect) {
@@ -404,7 +472,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _context3.next = 3;
               return this.core.effects.emit(RulesHooks.OnDestroy, {});
             case 3:
-              console.log("[Rules] 已销毁");
+              console.log('[Rules] 已销毁');
             case 4:
             case "end":
               return _context3.stop();
@@ -423,7 +491,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              console.log("[Rules] clear");
+              console.log('[Rules] clear');
             case 1:
             case "end":
               return _context4.stop();

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

@@ -1,4 +1,4 @@
-import { Discount } from "../Discount/types";
+import { Discount } from '../Discount/types';
 export declare enum RulesHooks {
     OnRulesListChange = "rules:onRulesListChange",
     OnDestroy = "rules:onDestroy"
@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
     }) => DiscountResult;
 }
 type ProductDetail = {
+    isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;
     id: number;
@@ -33,6 +34,9 @@ type ProductDetail = {
     discount_list: Discount[];
     origin_total: number;
     _id: string;
+    options?: any[];
+    bundle?: any[];
+    original_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;