@pisell/pisellos 2.3.17 → 2.3.19

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -66,7 +66,8 @@ function normalizeBundleItems(bundleItems) {
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
     normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -84,7 +84,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         unavailableReasonKey?: string | null;
         scannedDiscountList?: Discount[];
     }>;
-    applyDiscount(): void;
+    applyDiscount(options?: {
+        reapplyBookingDiscountProductUids?: string[];
+    }): void;
     /**
      * 注入促销评估器。
      *
@@ -197,6 +199,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;

package/lib/modules/Order/index.js

@@ -107,7 +107,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.draftPersistEnabled = true;
   }
   collectHydratedEditDiscounts(products) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const discountMap = /* @__PURE__ */ new Map();
     for (const product of (0, import_bundleDiscountHydration.expandHydratedProductsForDiscountCollection)(products)) {
       for (const item of (product == null ? void 0 : product.discount_list) || []) {
@@ -137,6 +137,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
           existed.balance = String(Number(existed.balance || 0) + amount);
+          const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
+          if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
+            existed.limited_relation_product_data = {
+              ...existed.limited_relation_product_data || {},
+              product_ids: [...productIds, product.product_id]
+            };
+          }
           existed.applicableProductDetails = [
             ...existed.applicableProductDetails || [],
             detail
@@ -153,9 +160,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           encoded: "",
           code: "",
           tag: type,
-          product_id: ((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          product_id: ((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
           relation_type: "",
-          par_value: String(((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          par_value: String(((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
           used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
           limit_status: "enable",
           limited_relation_product_data: {
@@ -185,8 +192,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           discount: {
             ...(item == null ? void 0 : item.discount) || {},
             resource_id: key,
-            discount_product_id: ((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
-            discount_calculation_mode: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_calculation_mode) ?? "item_level"
+            discount_product_id: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_j = item == null ? void 0 : item.discount) == null ? void 0 : _j.discount_calculation_mode) ?? "item_level"
           },
           applicableProductDetails: [detail],
           appliedProductDetails: [detail]
@@ -539,7 +546,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
-  applyDiscount() {
+  applyDiscount(options) {
     var _a, _b, _c, _d;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
@@ -560,6 +567,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       holders,
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
       orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0)
+    }, {
+      reapplyBookingDiscountProductUids: options == null ? void 0 : options.reapplyBookingDiscountProductUids
     });
     if (result == null ? void 0 : result.productList) {
       const previousProductsByUid = (0, import_utils.indexOrderProductsByUid)(tempOrder.products);
@@ -1470,10 +1479,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return currentAmountGap === snapshotAmountGap;
   }
-  restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-    const snapshot = this.getOriginalSalesSnapshot(tempOrder);
-    if (!snapshot)
-      return null;
+  hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+    const snapshotSummary = snapshot.summary && typeof snapshot.summary === "object" ? snapshot.summary : {};
+    const snapshotShopDiscount = snapshot.shop_discount ?? snapshotSummary.shop_discount;
+    if (snapshotShopDiscount === void 0 || snapshotShopDiscount === null || snapshotShopDiscount === "") {
+      return !new import_decimal.default(tempOrder.shop_discount || 0).equals(0);
+    }
+    return !new import_decimal.default(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+  }
+  restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
     const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
@@ -1974,14 +1988,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
+    var _a;
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
       return null;
     this.sanitizeTempOrderProducts(tempOrder);
-    const snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+    const originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+    const hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+    const shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+    const snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
     if (snapshotSummary)
       return snapshotSummary;
-    const shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+    const shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
     const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, import_lodash_es.cloneDeep)(tempOrder.products || []) : tempOrder.products;
     if (shouldFullRecalculateFromSnapshot) {
       this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -2028,7 +2046,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const salesSummaryResult = await salesSummary.getSummary({
       products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
-      shopDiscount: tempOrder.shop_discount
+      shopDiscount: tempOrder.shop_discount,
+      ...((_a = this.otherParams) == null ? void 0 : _a.channel) ? { channel: this.otherParams.channel } : {}
     });
     if (shouldFullRecalculateFromSnapshot) {
       tempOrder.products = summaryProducts;
@@ -2964,7 +2983,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   applyOrderProductUpdateToTempOrder(tempOrder, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const {
       product_id,
       product_variant_id,
@@ -3118,12 +3137,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.products[productIndex],
       (_q = tempOrder.products[productIndex].metadata) == null ? void 0 : _q.unique_identification_number
     );
+    return (_r = tempOrder.products[productIndex].metadata) == null ? void 0 : _r.unique_identification_number;
   }
   async updateOrderProduct(params) {
     const tempOrder = this.ensureTempOrder();
-    this.applyOrderProductUpdateToTempOrder(tempOrder, params);
+    const updatedProductUid = this.applyOrderProductUpdateToTempOrder(tempOrder, params);
     await this.applyPromotion();
-    this.applyDiscount();
+    this.applyDiscount({
+      reapplyBookingDiscountProductUids: params.allow_booking_discount_reapply && updatedProductUid ? [String(updatedProductUid)] : void 0
+    });
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -3947,6 +3969,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         products: (0, import_lodash_es.cloneDeep)(nextTempOrder.products || []),
         payments: (0, import_lodash_es.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []),
+        shop_discount: nextTempOrder.shop_discount || "0.00",
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };

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

@@ -340,6 +340,19 @@ export interface UpdateOrderProductParams {
      * });
      */
     allow_booking_reprice?: boolean;
+    /**
+     * Change time 重报价后，允许当前预约商品行重新应用已选编辑态折扣卡。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { discount_list: [] },
+     *   booking: { duration: 2 },
+     *   allow_booking_discount_reapply: true,
+     * });
+     */
+    allow_booking_discount_reapply?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {

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.d.ts

@@ -1,8 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
-import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
@@ -45,12 +44,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }, options?: {
-        isSelected?: boolean;
-        discountId?: number;
-        selectedList?: SetDiscountSelectedParams[];
-        scan?: boolean;
-    }): DiscountResult;
+    }, options?: RulesCalcDiscountOptions): DiscountResult;
     /**
      * 检查优惠是否符合 PackageSubItemUsageRules 配置
      * @param discount 优惠券

package/lib/modules/Rules/index.js

@@ -209,6 +209,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     const resolveIsFormSubject = (product) => typeof isFormSubject === "function" ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
+    const reapplyBookingDiscountProductUids = new Set(
+      ((options == null ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter((uid) => uid !== void 0 && uid !== null && uid !== "").map(String)
+    );
+    const getOriginProductUid = (originProduct) => {
+      var _a2;
+      const uid = ((_a2 = originProduct == null ? void 0 : originProduct.metadata) == null ? void 0 : _a2.unique_identification_number) ?? (originProduct == null ? void 0 : originProduct.unique_identification_number);
+      if (uid === void 0 || uid === null || uid === "")
+        return void 0;
+      return String(uid);
+    };
+    const shouldReapplyBookingDiscount = (originProduct, selectedDiscount) => {
+      if (!selectedDiscount)
+        return false;
+      const uid = getOriginProductUid(originProduct);
+      if (!uid || !reapplyBookingDiscountProductUids.has(uid))
+        return false;
+      const discountType = selectedDiscount.tag || selectedDiscount.type;
+      return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
+    };
+    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+      var _a2;
+      if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
+        return void 0;
+      const discountType = (selectedDiscount == null ? void 0 : selectedDiscount.tag) || (selectedDiscount == null ? void 0 : selectedDiscount.type);
+      if (discountType !== "discount_card" && discountType !== "product_discount_card") {
+        return void 0;
+      }
+      const percent = Number((_a2 = selectedDiscount.discount) == null ? void 0 : _a2.percent);
+      return Number.isFinite(percent) ? percent : void 0;
+    };
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -232,9 +262,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       });
     }
-    const filteredDiscountList = addModeDiscount.filter((discount) => {
-      return !discount.isManualSelect;
-    });
     const hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options == null ? void 0 : options.discountId) || Boolean((_a = options == null ? void 0 : options.selectedList) == null ? void 0 : _a.length) || Boolean(options == null ? void 0 : options.scan);
     if (!hasDiscountInput) {
       return {
@@ -242,6 +269,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    const canUseEditModeDiscountForReapply = (discount) => {
+      const discountType = discount.tag || discount.type;
+      return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
+    };
+    const filteredDiscountList = [
+      ...addModeDiscount.filter((discount) => !discount.isManualSelect),
+      ...editModeDiscount.filter(canUseEditModeDiscountForReapply)
+    ];
     const flattenProductsWithBundle = (productList2) => {
       const flattened = [];
       productList2.forEach((originProduct) => {
@@ -737,9 +772,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
         const discountType = discount.tag || discount.type;
+        const currentOriginUid = getOriginProductUid(originProduct);
+        const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
+        if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
+          const uid = currentOriginUid;
+          if (!uid || !reapplyBookingDiscountProductUids.has(uid))
+            return false;
+          if (!discount.isSelected)
+            return false;
+        }
         if (["good_pass", "discount_card", "product_discount_card"].includes(
           discountType
-        )) {
+        ) && !isReapplyEditModeDiscountForProduct) {
           if (discount.config === void 0 || !((_a3 = discount == null ? void 0 : discount.config) == null ? void 0 : _a3.isAvailable)) {
             return false;
           }
@@ -955,7 +999,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
+      const shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
         return;
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
@@ -1011,10 +1056,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let productDiscountDifference;
           let discountedOptions = product.options;
           let optionDiscountAmount = 0;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
           } else {
             mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1049,7 +1100,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.price,
               product_id: originProduct.id || originProduct.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             // 前端使用的num数量，为了计算优惠金额

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

@@ -1,4 +1,5 @@
 import { Discount } from '../Discount/types';
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare enum UnavailableReason {
     TimeLimit = "time_limit",
     ProductNotApplicable = "product_not_applicable",
@@ -23,6 +24,14 @@ export interface DiscountResult {
     discountList: any[];
 }
 export type RulesFormSubject = boolean | ((product: any) => boolean);
+export interface RulesCalcDiscountOptions {
+    isSelected?: boolean;
+    discountId?: number;
+    selectedList?: SetDiscountSelectedParams[];
+    scan?: boolean;
+    /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
+    reapplyBookingDiscountProductUids?: string[];
+}
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -34,7 +43,7 @@ export interface RulesModuleAPI {
         }[];
         isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }) => DiscountResult;
+    }, options?: RulesCalcDiscountOptions) => DiscountResult;
 }
 type ProductDetail = {
     isClient?: boolean;

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

@@ -9,16 +9,19 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private store;
     private request;
     private surchargeListModuleName;
+    private otherParams;
+    private surchargeListChannel;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
      *
      * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
      */
     updateOtherParams(params: Record<string, any>): Promise<void>;
-    getSurchargeList(): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(channel?: string): Promise<void>;
     private getAppData;
     private getTaxConfig;
     getSummary(params: {
@@ -26,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/lib/modules/SalesSummary/index.js

@@ -33,12 +33,15 @@ var salesSummaryDataKeys = {
   taxTitle: "tax_title",
   taxCountryCode: "tax_country_code"
 };
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "salesSummary";
     this.defaultVersion = "1.0.0";
     this.surchargeListModuleName = "surchargeList";
+    this.otherParams = {};
+    this.surchargeListChannel = DEFAULT_SURCHARGE_CHANNEL;
   }
   async initialize(core, options) {
     var _a, _b, _c;
@@ -46,9 +49,10 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
+    this.otherParams = options.otherParams || {};
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
-    this.surchargeListModuleName = ((_c = options.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
+    this.surchargeListModuleName = ((_c = this.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
     if (!this.appPlugin) {
       throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
@@ -58,41 +62,50 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     await this.getSurchargeList();
   }
   /**
-   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
    *
    * @example
-   * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+   * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
    */
   async updateOtherParams(params) {
+    const previousChannel = this.resolveChannel();
     const nextSurchargeListModuleName = (params == null ? void 0 : params.surchargeListModuleName) || "surchargeList";
-    if (nextSurchargeListModuleName === this.surchargeListModuleName)
-      return;
+    const nextChannel = this.resolveChannel(params);
+    const shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+    this.otherParams = params || {};
     this.surchargeListModuleName = nextSurchargeListModuleName;
-    await this.getSurchargeList();
+    if (shouldReload) {
+      await this.getSurchargeList(nextChannel);
+    }
   }
-  async getSurchargeList() {
+  resolveChannel(params = this.otherParams) {
+    return (params == null ? void 0 : params.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(channel = this.resolveChannel()) {
     try {
       const surchargeListModule = this.core.getModule(
         this.surchargeListModuleName
       );
       if (surchargeListModule == null ? void 0 : surchargeListModule.getSurchargeList) {
-        this.store.surchargeList = await surchargeListModule.getSurchargeList();
+        this.store.surchargeList = await surchargeListModule.getSurchargeList({ channel });
+        this.surchargeListChannel = channel;
         return;
       }
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          // TODO 真实的渠道
-          channel: "online-store",
+          channel,
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
       this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      this.surchargeListChannel = channel;
     } catch (error) {
       console.warn("[SalesSummaryModule] 加载附加费配置失败", error);
       this.store.surchargeList = [];
+      this.surchargeListChannel = channel;
     }
   }
   getAppData(key) {
@@ -114,7 +127,11 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   }
   async getSummary(params) {
     var _a, _b;
-    const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
+    const { products = [], isPriceIncludeTax, taxRate, shopDiscount, channel } = params;
+    const summaryChannel = channel || this.resolveChannel();
+    if (summaryChannel !== this.surchargeListChannel) {
+      await this.getSurchargeList(summaryChannel);
+    }
     const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`

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

@@ -63,5 +63,6 @@ export interface SalesSummaryModuleAPI {
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<SalesSummaryData>;
 }

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

@@ -1,16 +1,18 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { SurchargeListItem, SurchargeListModuleAPI } from './types';
+import { SurchargeListItem, SurchargeListModuleAPI, SurchargeListQuery } from './types';
 export * from './types';
 export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private request;
     private store;
-    private loadingPromise;
+    private loadingPromises;
+    private requestVersion;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    private resolveChannel;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
     private loadSurchargeList;
 }