@pisell/pisellos 2.1.61 → 2.1.62

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -349,8 +349,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var priceA = new Decimal(a.price || '0');
-        var priceB = new Decimal(b.price || '0');
+        var _ref3, _a$original_price, _ref4, _b$original_price;
+        // 子商品优先使用 original_price，主商品使用 price
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -597,8 +599,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product7, _product7$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref3;
-            return !((_ref3 = item.discount_list || []) !== null && _ref3 !== void 0 && _ref3.length);
+            var _ref5;
+            return !((_ref5 = item.discount_list || []) !== null && _ref5 !== void 0 && _ref5.length);
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product7 = product) === null || _product7 === void 0 || (_product7 = _product7.discount_list) === null || _product7 === void 0 || (_product7$every = _product7.every) === null || _product7$every === void 0 ? void 0 : _product7$every.call(_product7, function (item) {
             return item.type === 'product';
           })));
@@ -608,8 +610,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (parentProduct) {
             var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref4;
-              return !((_ref4 = item.discount_list || []) !== null && _ref4 !== void 0 && _ref4.length);
+              var _ref6;
+              return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
             }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
               return item.type === 'product';
             })));

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.js

@@ -241,8 +241,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const flattenedList = flattenProductsWithBundle(productList);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
       var _a, _b;
-      const priceA = new import_decimal.default(a.price || "0");
-      const priceB = new import_decimal.default(b.price || "0");
+      const priceA = new import_decimal.default(
+        a.type === "bundle" ? a.original_price ?? a.price ?? "0" : a.price || "0"
+      );
+      const priceB = new import_decimal.default(
+        b.type === "bundle" ? b.original_price ?? b.price ?? "0" : b.price || "0"
+      );
       if (priceA.equals(priceB)) {
         if (a.type !== b.type) {
           return a.type === "main" ? -1 : 1;

package/lib/solution/BookingTicket/index.js

@@ -122,12 +122,6 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  /**
-   * 初始化外设扫码结果监听
-   */
-  initPeripheralsListener() {
-    this.scan.initPeripheralsListener();
-  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

package/package.json

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