@pisell/pisellos 2.2.101 → 2.2.103

package/lib/modules/Rules/index.js

@@ -353,12 +353,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             available_product_type: (_a = discount.limited_relation_product_data) == null ? void 0 : _a.type,
             available_product_ids: (_b = discount.limited_relation_product_data) == null ? void 0 : _b.product_ids
           };
-          const productsForEvaluate = sortedFlattenedList.map((item) => ({
-            product_id: item.id,
-            price: item.price || 0,
-            quantity: item.quantity || item.num || 1,
-            selling_price: item.price || 0
-          }));
+          const productsForEvaluate = sortedFlattenedList.map((item) => {
+            var _a2;
+            return {
+              product_id: item.id,
+              price: item.price || 0,
+              quantity: item.quantity || item.num || 1,
+              selling_price: item.price || 0,
+              product_options: item.type === "main" ? (_a2 = item.product) == null ? void 0 : _a2.options : void 0
+            };
+          });
           const result = evaluator.checkVoucherAvailability({
             orderTotalAmount,
             products: productsForEvaluate,
@@ -584,8 +588,47 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
+    const applyDiscountToOptions = (options2, discount) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return { discountedOptions: options2, optionDiscountAmount: 0 };
+      let optionDiscountAmount = 0;
+      const discountedOptions = options2.map((option) => {
+        const addPrice = Number(option.add_price || 0);
+        if (addPrice <= 0)
+          return option;
+        const discountedPrice = (0, import_utils.getDiscountAmount)(discount, addPrice, addPrice);
+        const optQty = Number(option.num ?? option.quantity ?? 1);
+        optionDiscountAmount = new import_decimal.default(optionDiscountAmount).plus(new import_decimal.default(addPrice).minus(discountedPrice).mul(optQty)).toNumber();
+        return {
+          ...option,
+          _original_add_price: option._original_add_price ?? option.add_price,
+          add_price: discountedPrice
+        };
+      });
+      return { discountedOptions, optionDiscountAmount };
+    };
+    const restoreOptionPrices = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return options2;
+      return options2.map((option) => {
+        if (option._original_add_price !== void 0) {
+          const { _original_add_price, ...rest } = option;
+          return { ...rest, add_price: _original_add_price };
+        }
+        return option;
+      });
+    };
+    const getOptionTotal = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return 0;
+      return options2.reduce((sum, opt) => {
+        const unit = Number(opt.add_price ?? opt.price ?? 0);
+        const n = Number(opt.num ?? opt.quantity ?? 1);
+        return new import_decimal.default(sum).plus(new import_decimal.default(unit).mul(n)).toNumber();
+      }, 0);
+    };
     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, _z, _A, _B, _C;
+      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, _C, _D, _E, _F;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -784,6 +827,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (flatItem.type === "main") {
+          const restoredOptions = restoreOptionPrices(product.options);
           if (product.isClient) {
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
@@ -793,7 +837,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                       original_price: product.original_price
                     },
                     bundle: product.bundle,
-                    options: product.options
+                    options: restoredOptions
                   }),
                   variant: originProduct._productInit.variant,
                   original_price: originProduct._productInit.original_price,
@@ -802,9 +846,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                       price: product.price
                     },
                     bundle: product.bundle,
-                    options: product.options
+                    options: restoredOptions
                   }),
-                  price: product.price
+                  price: product.price,
+                  options: restoredOptions
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
@@ -825,7 +870,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
                   price: product.price,
-                  main_product_selling_price
+                  main_product_selling_price,
+                  options: restoredOptions
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
@@ -891,26 +937,46 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          let targetProductTotal;
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
+          let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
+          let discountedOptions = product.options;
+          let optionDiscountAmount = 0;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
-            targetProductTotal = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+            mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
           } else {
-            targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
-            amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+            mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
+              selectedDiscount2,
+              product.price,
+              product.price
+            );
+            amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
+          }
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
+            const optionResult = applyDiscountToOptions(
+              product.options,
+              selectedDiscount2
+            );
+            discountedOptions = optionResult.discountedOptions;
+            optionDiscountAmount = optionResult.optionDiscountAmount;
           }
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
+          const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
+          const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
+          const mainProductDiscountAmount = amount;
+          const lineDiscountAmount = new import_decimal.default(mainProductDiscountAmount).plus(optionDiscountAmount).toNumber();
           const discountType = selectedDiscount2.tag || selectedDiscount2.type;
           const isGoodPass = discountType === "good_pass";
           const discountDetail = {
-            amount,
+            amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
-              fixed_amount: amount,
-              discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              fixed_amount: lineDiscountAmount,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -924,35 +990,32 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             metadata: {
               num: 1,
               // 🔥 order_level 分摊差值
-              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference },
+              /** 仅主商品上的优惠金额（不含 option） */
+              mainProductDiscountAmount,
+              optionDiscountAmount
             }
           };
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
-          let total = targetProductTotal;
-          if (product.options) {
-            total = product.options.reduce((accumulator, currentValue) => {
-              const currentPrice = new import_decimal.default(currentValue.price || 0);
-              const currentNum = new import_decimal.default(currentValue.num || 0);
-              return accumulator.add(currentPrice.mul(currentNum));
-            }, new import_decimal.default(total)).toNumber();
-          }
           if (product.isClient) {
             arr.push(
               this.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+                // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
+                price: isGoodPass ? mainProductSellingPrice : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoreOptionPrices(product.options)
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new import_decimal.default(product.price || 0).toNumber(),
-                total
+                total,
+                options: discountedOptions
               })
             );
           } else {
@@ -964,7 +1027,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total,
                 origin_total: productOriginTotal,
-                main_product_selling_price: targetProductTotal
+                main_product_selling_price: mainProductSellingPrice,
+                options: discountedOptions
               })
             );
           }
@@ -994,7 +1058,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_calculation_mode,
+                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1068,9 +1132,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1086,7 +1150,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) * (((_C = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _C.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -1109,6 +1173,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const mainProductArr = processedProductsMap2.get(product._id);
         if (!mainProductArr || mainProductArr.length === 0) {
           const getDefaultProduct = () => {
+            const restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
@@ -1118,7 +1183,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoredOptions
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: originProduct._productInit.original_price,
@@ -1127,15 +1192,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     price: product.price
                   },
                   bundle: product.bundle,
-                  options: product.options
-                })
+                  options: restoredOptions
+                }),
+                options: restoredOptions
               });
             } else {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 total: product.total,
                 origin_total: product.origin_total,
-                price: product.price
+                price: product.price,
+                options: restoreOptionPrices(product.options)
               });
             }
           };

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

@@ -61,6 +61,7 @@ export interface RulesParamsHooks {
         quantity?: number;
         bundle?: any[];
         main_product_selling_price?: string | number;
+        options?: any[];
     }) => Record<string, any>;
 }
 export {};

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

@@ -131,7 +131,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/package.json

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