@pisell/pisellos 0.0.395 → 0.0.396

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

@@ -98,7 +98,9 @@ export interface Discount {
     isEditMode?: boolean;
     isScan?: boolean;
     discount?: {
+        discount_product_id: number;
         resource_id: number;
+        discount_calculation_mode: 'item_level' | 'order_level';
     };
     isManualSelect?: boolean;
     isDisabled?: boolean;

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

@@ -227,6 +227,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
       });
 
+      // 🔥 检查 editModeDiscount 中是否有订单级别的折扣，如果有则禁用 addModeDiscount 中相同 product_id 的折扣卡
+      var editModeOrderLevelProductIds = new Set();
+      editModeDiscount.forEach(function (discount) {
+        var _discount$discount2;
+        if (((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.discount_calculation_mode) === 'order_level') {
+          var _discount$discount3;
+          editModeOrderLevelProductIds.add(discount === null || discount === void 0 || (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.discount_product_id);
+        }
+      });
+
+      // 如果存在订单级别的编辑模式折扣，禁用 addModeDiscount 中相同 product_id 的折扣卡
+      if (editModeOrderLevelProductIds.size > 0) {
+        addModeDiscount.forEach(function (discount) {
+          if (editModeOrderLevelProductIds.has(discount.product_id)) {
+            discount.isDisabled = true;
+          }
+        });
+      }
+
       // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑
       var filteredDiscountList = addModeDiscount.filter(function (discount) {
         return !discount.isManualSelect;
@@ -562,6 +581,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             return;
           }
 
+          // 🔥 vouchersApplicable 为 false 的商品不参与订单级别折扣均摊
+          if (isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+            return;
+          }
+
           // 商品价格为0时不可用
           if (Number(product.price) <= 0 || !product.price) {
             return;
@@ -662,7 +686,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
-            var _discountApplicabilit, _discount$metadata4;
+            var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -680,6 +704,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               discount: {
                 discount_card_type: discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.discount_card_type,
                 fixed_amount: product.price,
+                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_calculation_mode,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
@@ -986,7 +1011,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _selectedDiscount$met;
+            var _product$discount_lis10, _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1040,6 +1065,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               discount: {
                 discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
                 fixed_amount: actualDiscountAmount,
+                discount_calculation_mode: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met2 = _selectedDiscount.metadata) === null || _selectedDiscount$met2 === void 0 ? void 0 : _selectedDiscount$met2.discount_calculation_mode,
                 resource_id: _selectedDiscount.id,
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
@@ -1109,6 +1135,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
+              var _selectedDiscount2$me;
               var _selectedDiscount2 = applicableDiscounts[_i];
               usedDiscounts.set(_selectedDiscount2.id, true);
               // 🔥 更新 product_id 使用计数
@@ -1128,6 +1155,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 type: 'good_pass',
                 discount: {
                   fixed_amount: product.origin_total,
+                  discount_calculation_mode: _selectedDiscount2 === null || _selectedDiscount2 === void 0 || (_selectedDiscount2$me = _selectedDiscount2.metadata) === null || _selectedDiscount2$me === void 0 ? void 0 : _selectedDiscount2$me.discount_calculation_mode,
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
@@ -1173,7 +1201,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _flatItem$parentProdu8;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu8;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1201,7 +1229,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
-
+            debugger;
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
@@ -1210,6 +1238,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               discount: {
                 discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
                 fixed_amount: fixedAmountPerItem,
+                discount_calculation_mode: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me2 = _selectedDiscount3.metadata) === null || _selectedDiscount3$me2 === void 0 ? void 0 : _selectedDiscount3$me2.discount_calculation_mode,
                 resource_id: _selectedDiscount3.id,
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
@@ -1393,8 +1422,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
               var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
-                var _discount$metadata5, _discount$metadata6;
-                if (discount !== null && discount !== void 0 && (_discount$metadata5 = discount.metadata) !== null && _discount$metadata5 !== void 0 && _discount$metadata5.custom_product_bundle_map_id) {
+                var _discount$metadata6, _discount$metadata7;
+                if (discount !== null && discount !== void 0 && (_discount$metadata6 = discount.metadata) !== null && _discount$metadata6 !== void 0 && _discount$metadata6.custom_product_bundle_map_id) {
                   // bundle的discount_list保持不变
                   return discount;
                 }
@@ -1402,7 +1431,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, discount), {}, {
                   // num: 1,
                   metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
-                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.custom_product_bundle_map_id,
+                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata7 = discount.metadata) === null || _discount$metadata7 === void 0 ? void 0 : _discount$metadata7.custom_product_bundle_map_id,
                     num: 1
                   })
                 });
@@ -1467,8 +1496,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
                 var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
-                  var _discount$metadata7, _discount$metadata8;
-                  if (discount !== null && discount !== void 0 && (_discount$metadata7 = discount.metadata) !== null && _discount$metadata7 !== void 0 && _discount$metadata7.custom_product_bundle_map_id) {
+                  var _discount$metadata8, _discount$metadata9;
+                  if (discount !== null && discount !== void 0 && (_discount$metadata8 = discount.metadata) !== null && _discount$metadata8 !== void 0 && _discount$metadata8.custom_product_bundle_map_id) {
                     // bundle的discount_list保持不变
                     return discount;
                   }
@@ -1476,7 +1505,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread(_objectSpread({}, discount), {}, {
                     metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                       num: mainProductQuantity - 1,
-                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata8 = discount.metadata) === null || _discount$metadata8 === void 0 ? void 0 : _discount$metadata8.custom_product_bundle_map_id
+                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
                     })
                     // num: mainProductQuantity - 1,
                   });
@@ -1541,11 +1570,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       processedBundleItems.forEach(function (item) {
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                          var _discount$metadata9;
+                          var _discount$metadata10;
                           return _objectSpread(_objectSpread({}, discount), {}, {
                             metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                               num: item.num,
-                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
+                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
                             })
                             // num: item.num, // 使用拆分后的 num
                           });

package/dist/solution/BookingByStep/index.d.ts

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/ShopDiscount/utils.js

@@ -52,7 +52,8 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
 
     // 固定金额 小于0时返回0
     if (isFixedAmount) {
-      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(discount.amount || 0)).toNumber(), 0);
+      var _discount$amount;
+      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(((_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.par_value) || 0)).toNumber(), 0);
     } else {
       // 百分比：根据折扣卡金额计算
       discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();

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

@@ -98,7 +98,9 @@ export interface Discount {
     isEditMode?: boolean;
     isScan?: boolean;
     discount?: {
+        discount_product_id: number;
         resource_id: number;
+        discount_calculation_mode: 'item_level' | 'order_level';
     };
     isManualSelect?: boolean;
     isDisabled?: boolean;

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

@@ -164,6 +164,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         addModeDiscount.push(discount);
       }
     });
+    const editModeOrderLevelProductIds = /* @__PURE__ */ new Set();
+    editModeDiscount.forEach((discount) => {
+      var _a, _b;
+      if (((_a = discount.discount) == null ? void 0 : _a.discount_calculation_mode) === "order_level") {
+        editModeOrderLevelProductIds.add((_b = discount == null ? void 0 : discount.discount) == null ? void 0 : _b.discount_product_id);
+      }
+    });
+    if (editModeOrderLevelProductIds.size > 0) {
+      addModeDiscount.forEach((discount) => {
+        if (editModeOrderLevelProductIds.has(discount.product_id)) {
+          discount.isDisabled = true;
+        }
+      });
+    }
     const filteredDiscountList = addModeDiscount.filter((discount) => {
       return !discount.isManualSelect;
     });
@@ -393,6 +407,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (!isAvailableProduct) {
           return;
         }
+        if ((0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+          return;
+        }
         if (Number(product.price) <= 0 || !product.price) {
           return;
         }
@@ -445,7 +462,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a2, _b, _c, _d, _e, _f, _g;
+        var _a2, _b, _c, _d, _e, _f, _g, _h;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
@@ -480,6 +497,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount: {
               discount_card_type: (_g = discount == null ? void 0 : discount.metadata) == null ? void 0 : _g.discount_card_type,
               fixed_amount: product.price,
+              discount_calculation_mode: (_h = discount == null ? void 0 : discount.metadata) == null ? void 0 : _h.discount_calculation_mode,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
@@ -498,7 +516,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -811,6 +829,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount: {
               discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
               fixed_amount: actualDiscountAmount,
+              discount_calculation_mode: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -891,6 +910,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
+                discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -959,13 +979,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           }
+          debugger;
           const uniqueId = flatItem._id;
           const discountDetail = {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
+              discount_card_type: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_card_type,
               fixed_amount: fixedAmountPerItem,
+              discount_calculation_mode: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -981,7 +1003,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)
+            _num: (product.num || 1) * (((_B = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _B.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/solution/BookingByStep/index.d.ts

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/ShopDiscount/utils.js

@@ -62,7 +62,7 @@ var getDiscountAmount = (discount, total, price) => {
   } else {
     const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
     if (isFixedAmount) {
-      discountedPrice = Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.amount || 0)).toNumber(), 0);
+      discountedPrice = Math.max(new import_decimal.default(price).minus(new import_decimal.default((discount.amount ?? discount.par_value) || 0)).toNumber(), 0);
     } else {
       discountedPrice = new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
     }

package/package.json

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