@pisell/pisellos 2.2.260 → 2.2.262

package/lib/modules/Order/utils.js

@@ -37,7 +37,7 @@ __export(utils_exports, {
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
-  createUuidV4: () => createUuidV4,
+  createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -49,9 +49,11 @@ __export(utils_exports, {
   getBundleSignedUnit: () => getBundleSignedUnit,
   getOrderProductLineUid: () => getOrderProductLineUid,
   getProductSkuOptions: () => getProductSkuOptions,
+  getRuntimeProductOrigin: () => getRuntimeProductOrigin,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
+  isHolderConfigRequired: () => isHolderConfigRequired,
   isMarkdownBundle: () => isMarkdownBundle,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
@@ -65,7 +67,9 @@ __export(utils_exports, {
   normalizeProductSkuOptions: () => normalizeProductSkuOptions,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  productRequiresFormSubject: () => productRequiresFormSubject,
   resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
+  resolveIsFormSubject: () => resolveIsFormSubject,
   resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
   resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
   resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
@@ -82,6 +86,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
+var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
@@ -282,9 +287,6 @@ function calculateOrderProductsDeposit(products = [], options) {
     if (!(deposit == null ? void 0 : deposit.total) || Number(deposit.total) <= 0)
       continue;
     total = total.plus(deposit.total);
-    for (const discount of product.discount_list || []) {
-      total = total.minus((discount == null ? void 0 : discount.amount) || 0);
-    }
     for (const protocol of deposit.protocols || []) {
       if (!protocolMap.has(protocol.id))
         protocolMap.set(protocol.id, protocol);
@@ -376,6 +378,42 @@ function normalizeOrderProductDiscountList(discountList) {
     return normalized;
   });
 }
+function resolveSubmitBundleMapId(bundle) {
+  var _a;
+  const metadataMapId = (_a = bundle.metadata) == null ? void 0 : _a.custom_product_bundle_map_id;
+  if (metadataMapId !== void 0 && metadataMapId !== null && metadataMapId !== "") {
+    return metadataMapId;
+  }
+  if (bundle._id !== void 0 && bundle._id !== null && bundle._id !== "") {
+    return bundle._id;
+  }
+  return void 0;
+}
+function collectSubmitProductDiscountList(product) {
+  const submitDiscountList = Array.isArray(product == null ? void 0 : product.discount_list) ? [...product.discount_list] : [];
+  for (const bundle of (product == null ? void 0 : product.product_bundle) || []) {
+    if (!bundle || typeof bundle !== "object")
+      continue;
+    const bundleMapId = resolveSubmitBundleMapId(bundle);
+    const bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
+    for (const discount of bundleDiscountList) {
+      if (!discount || typeof discount !== "object")
+        continue;
+      const discountMetadata = discount.metadata && typeof discount.metadata === "object" ? discount.metadata : {};
+      const discountMapId = discountMetadata.custom_product_bundle_map_id !== void 0 && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== "" ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
+      submitDiscountList.push({
+        ...discount,
+        ...discountMapId !== void 0 ? {
+          metadata: {
+            ...discountMetadata,
+            custom_product_bundle_map_id: discountMapId
+          }
+        } : {}
+      });
+    }
+  }
+  return normalizeOrderProductDiscountList(submitDiscountList);
+}
 function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
   var _a, _b;
   const metadata = params.metadata || {};
@@ -455,13 +493,17 @@ function createDefaultOrderRulesHooks() {
       const current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current)
         return bundle;
+      const bundleWithDisplayFields = {
+        ...bundle,
+        ...isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? { cover: current.cover } : {}
+      };
       const isProductPriceBundle = (bundle.price_type_ext ?? current.price_type_ext) === "product_price";
       if (!isProductPriceBundle)
-        return bundle;
+        return bundleWithDisplayFields;
       const sourcePrice = current.price ?? current.custom_price ?? current.original_price ?? current.bundle_selling_price;
       const originalPrice = current.original_price ?? current.product_price ?? current.price ?? current.custom_price ?? sourcePrice;
       return {
-        ...bundle,
+        ...bundleWithDisplayFields,
         ...sourcePrice !== void 0 ? { price: sourcePrice } : {},
         ...originalPrice !== void 0 ? { original_price: originalPrice } : {},
         ...current.original_total !== void 0 ? { original_total: current.original_total } : {}
@@ -600,14 +642,6 @@ var getAllDiscountList = (cartItem) => {
   });
   return discountList;
 };
-function createUuidV4() {
-  const template = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
-  return template.replace(/[xy]/g, (char) => {
-    const randomValue = Math.floor(Math.random() * 16);
-    const value = char === "x" ? randomValue : randomValue & 3 | 8;
-    return value.toString(16);
-  });
-}
 function isTempOrder(data) {
   if (!data || typeof data !== "object")
     return false;
@@ -671,6 +705,10 @@ function formatSubmitBundleItems(bundle) {
   return bundle.map((b) => {
     const rawBundle = b && typeof b === "object" ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
+    const {
+      custom_product_bundle_map_id: _customProductBundleMapId,
+      ...submitMetadata
+    } = existedMetadata;
     const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
     const paymentPrice = rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
     const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
@@ -683,6 +721,8 @@ function formatSubmitBundleItems(bundle) {
       0
     );
     const num = toBundleNumber(rawBundle.num ?? rawBundle.quantity, 1);
+    const bundleMapId = resolveSubmitBundleMapId(rawBundle);
+    const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
@@ -699,8 +739,10 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
       bundle_product_id: (rawBundle == null ? void 0 : rawBundle.bundle_product_id) ?? (rawBundle == null ? void 0 : rawBundle._bundle_product_id),
+      cover: rawBundle.cover,
       metadata: {
-        ...existedMetadata,
+        ...submitMetadata,
+        ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -756,6 +798,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.is_rule !== void 0) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
+  if (rawMetadata.holder_config !== void 0) {
+    cleanMetadata.holder_config = rawMetadata.holder_config;
+  }
   const productSku = {
     ...submitProduct.product_sku && typeof submitProduct.product_sku === "object" ? submitProduct.product_sku : {},
     option: formatSubmitOptionItems((_a = submitProduct.product_sku) == null ? void 0 : _a.option)
@@ -765,7 +810,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
+    discount_list: collectSubmitProductDiscountList(submitProduct),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
@@ -886,7 +931,7 @@ function buildSubmitPayload(params) {
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
-  const bookingUuid = createUuidV4();
+  const bookingUuid = (0, import_orderCollectionIdentity.createUuidV4)();
   const {
     _extend,
     relation_id: _relationId,
@@ -1034,7 +1079,7 @@ function formatV1Product(products) {
       note: String(product.note ?? ""),
       rowKey: product.product_id,
       session: null,
-      unique: createUuidV4()
+      unique: (0, import_orderCollectionIdentity.createUuidV4)()
     };
   });
 }
@@ -1094,6 +1139,42 @@ function getOrderProductLineUid(product) {
     return null;
   return String(uid);
 }
+function getRuntimeProductOrigin(tempOrder, product) {
+  var _a, _b, _c, _d, _e, _f;
+  const uid = getOrderProductLineUid(product);
+  if (uid && ((_c = (_b = (_a = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _a.productsByUid) == null ? void 0 : _b[uid]) == null ? void 0 : _c.origin)) {
+    return tempOrder._extend.productsByUid[uid].origin;
+  }
+  const matchedProduct = ((tempOrder == null ? void 0 : tempOrder.products) || []).find((item) => item === product || getOrderProductLineUid(item) === uid || String((item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? "") === String((product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id) ?? ""));
+  const matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : "";
+  return matchedUid ? ((_f = (_e = (_d = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[matchedUid]) == null ? void 0 : _f.origin) || null : null;
+}
+function isHolderConfigRequired(holderConfig) {
+  if (!holderConfig || typeof holderConfig !== "object")
+    return false;
+  if (holderConfig.status === "disable")
+    return false;
+  return Number(holderConfig.required) === 1;
+}
+function productRequiresFormSubject(tempOrder, product) {
+  var _a, _b;
+  const _orderProduct = (_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.find((item) => {
+    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
+  });
+  const runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired((_b = _orderProduct == null ? void 0 : _orderProduct.metadata) == null ? void 0 : _b.holder_config) || isHolderConfigRequired(runtimeOrigin == null ? void 0 : runtimeOrigin.holder_config) || isHolderConfigRequired(product == null ? void 0 : product.holder_config);
+}
+function resolveIsFormSubject(tempOrder, product) {
+  var _a;
+  debugger;
+  if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
+    return true;
+  if (product)
+    return productRequiresFormSubject(tempOrder, product);
+  return ((tempOrder == null ? void 0 : tempOrder.products) || []).some(
+    (item) => productRequiresFormSubject(tempOrder, item)
+  );
+}
 function isEmptyOrderProductDisplayValue(value) {
   if (value === void 0 || value === null)
     return true;
@@ -1114,6 +1195,7 @@ function mergeOrderProductDisplayFields(previous, next) {
     "product_name",
     "product_cover",
     "cover",
+    "product_cover",
     "variant_title",
     "product_sku",
     "payment_price"
@@ -1174,9 +1256,11 @@ function indexOrderProductsByUid(products) {
   getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
+  getRuntimeProductOrigin,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isHolderConfigRequired,
   isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
@@ -1190,7 +1274,9 @@ function indexOrderProductsByUid(products) {
   normalizeProductSkuOptions,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  productRequiresFormSubject,
   resolveEffectivePerUnitDiscount,
+  resolveIsFormSubject,
   resolveManualDiscountMessage,
   resolveManualDiscountOriginTotal,
   resolveManualDiscountReasonFromSources,

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, 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;
@@ -24,7 +23,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,14 +42,9 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        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

@@ -70,7 +70,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
       return true;
-    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
+    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : void 0;
     const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
     if (!product.isNeedHolder)
       return true;
@@ -207,7 +207,38 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     orderTotalAmount
   }, options) {
     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) => {
@@ -231,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 {
@@ -241,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) => {
@@ -596,7 +632,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
@@ -736,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;
           }
@@ -767,7 +812,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
@@ -954,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";
@@ -1010,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,
@@ -1048,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",
@@ -22,6 +23,15 @@ export interface DiscountResult {
     productList: any[];
     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>;
@@ -31,9 +41,9 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        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/SalesSummary/utils.js

@@ -308,6 +308,8 @@ function getFallbackAllProductSurchargeIds(surchargeList) {
       return ids;
     if (Number(config.is_all ?? 0) !== 1)
       return ids;
+    if (Number(config.open_schedule ?? 0) === 1 && config.schedule_type !== "all")
+      return ids;
     ids.push(id);
     return ids;
   }, []);

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;
 }