@pisell/pisellos 2.2.257 → 2.2.259

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

@@ -491,7 +491,7 @@ export interface OrderPaymentData {
     voucher_id?: string | number;
     origin_amount?: string;
     service_fee?: string;
-    status?: 'active' | 'voided' | string;
+    status?: 'active' | 'paid' | 'voided' | 'payment_pending' | string;
     /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
     wallet_pass_usage_unit?: unknown;
@@ -537,9 +537,15 @@ export interface SyncPaymentsToOrderParams {
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
+    confirmPendingVoucherPayments?: boolean;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
+    isOrderFullyPaid: boolean;
+    isDepositFullyPaid: boolean;
+    paymentStage: 'deposit' | 'normal';
+    depositAmount: string;
+    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {
@@ -691,6 +697,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     submitTempOrderAsync: <T = any>(params?: {
@@ -702,6 +709,7 @@ export interface OrderModuleAPI {
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     getOrderPayments: () => OrderPaymentData[];
@@ -709,7 +717,17 @@ export interface OrderModuleAPI {
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
     updateOrderPayment: (paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>) => OrderPaymentData[];
     deleteOrderPayment: (paymentIdentity: string | number) => OrderPaymentData[];
-    updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
+    updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }) => OrderPaymentData[];
+    confirmPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
+    discardPendingVoucherPayments: (options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {

package/lib/modules/Order/utils/bundleDiscountHydration.d.ts

@@ -0,0 +1,5 @@
+import type { OrderProductDiscountItem } from '../types';
+type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
+export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
+export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
+export {};

package/lib/modules/Order/utils/bundleDiscountHydration.js

@@ -0,0 +1,139 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/utils/bundleDiscountHydration.ts
+var bundleDiscountHydration_exports = {};
+__export(bundleDiscountHydration_exports, {
+  expandHydratedProductsForDiscountCollection: () => expandHydratedProductsForDiscountCollection,
+  restoreHydratedBundleDiscounts: () => restoreHydratedBundleDiscounts
+});
+module.exports = __toCommonJS(bundleDiscountHydration_exports);
+var BUNDLE_MAP_ID_KEY = "custom_product_bundle_map_id";
+function getBundleMapId(bundle) {
+  var _a;
+  const metadataMapId = (_a = bundle == null ? void 0 : bundle.metadata) == null ? void 0 : _a[BUNDLE_MAP_ID_KEY];
+  if (metadataMapId !== void 0 && metadataMapId !== null && metadataMapId !== "") {
+    return String(metadataMapId);
+  }
+  if ((bundle == null ? void 0 : bundle._id) !== void 0 && bundle._id !== null && bundle._id !== "") {
+    return String(bundle._id);
+  }
+  return null;
+}
+function getDiscountBundleMapId(discount) {
+  var _a;
+  const mapId = (_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a[BUNDLE_MAP_ID_KEY];
+  if (mapId === void 0 || mapId === null || mapId === "")
+    return null;
+  return String(mapId);
+}
+function hasSameBundleDiscount(discountList, discount) {
+  var _a;
+  const targetOrderDiscountId = discount.order_discount_id;
+  if (targetOrderDiscountId !== void 0 && targetOrderDiscountId !== null) {
+    return discountList.some((item) => (item == null ? void 0 : item.order_discount_id) === targetOrderDiscountId);
+  }
+  const targetResourceId = ((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id) ?? (discount == null ? void 0 : discount.resource_id) ?? (discount == null ? void 0 : discount.discount_id);
+  const targetMapId = getDiscountBundleMapId(discount);
+  return discountList.some((item) => {
+    var _a2;
+    const resourceId = ((_a2 = item == null ? void 0 : item.discount) == null ? void 0 : _a2.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id);
+    return resourceId === targetResourceId && String((item == null ? void 0 : item.amount) ?? "") === String((discount == null ? void 0 : discount.amount) ?? "") && getDiscountBundleMapId(item) === targetMapId;
+  });
+}
+function restoreHydratedBundleDiscounts(product, normalizeDiscountList) {
+  if (!Array.isArray(product.product_bundle) || !Array.isArray(product.discount_list)) {
+    return product;
+  }
+  const bundleByMapId = /* @__PURE__ */ new Map();
+  product.product_bundle.forEach((bundle) => {
+    if (!bundle || typeof bundle !== "object")
+      return;
+    const mapId = getBundleMapId(bundle);
+    if (mapId)
+      bundleByMapId.set(mapId, bundle);
+  });
+  if (!bundleByMapId.size)
+    return product;
+  const mainDiscountList = [];
+  const bundleDiscounts = [];
+  product.discount_list.forEach((discount) => {
+    const mapId = getDiscountBundleMapId(discount);
+    if (mapId && bundleByMapId.has(mapId)) {
+      bundleDiscounts.push({ mapId, discount });
+    } else {
+      mainDiscountList.push(discount);
+    }
+  });
+  if (!bundleDiscounts.length)
+    return product;
+  return {
+    ...product,
+    discount_list: normalizeDiscountList(mainDiscountList),
+    product_bundle: product.product_bundle.map((bundle) => {
+      if (!bundle || typeof bundle !== "object")
+        return bundle;
+      const mapId = getBundleMapId(bundle);
+      if (!mapId)
+        return bundle;
+      const matchedDiscounts = bundleDiscounts.filter((item) => item.mapId === mapId).map((item) => item.discount);
+      if (!matchedDiscounts.length)
+        return bundle;
+      const currentDiscountList = Array.isArray(bundle.discount_list) ? [...bundle.discount_list] : [];
+      for (const discount of matchedDiscounts) {
+        if (!hasSameBundleDiscount(currentDiscountList, discount)) {
+          currentDiscountList.push(discount);
+        }
+      }
+      return {
+        ...bundle,
+        discount_list: normalizeDiscountList(currentDiscountList),
+        metadata: {
+          ...bundle.metadata || {},
+          [BUNDLE_MAP_ID_KEY]: mapId
+        }
+      };
+    })
+  };
+}
+function expandHydratedProductsForDiscountCollection(products) {
+  const expanded = [];
+  for (const product of products || []) {
+    expanded.push(product);
+    for (const bundle of (product == null ? void 0 : product.product_bundle) || []) {
+      if (!Array.isArray(bundle == null ? void 0 : bundle.discount_list) || bundle.discount_list.length === 0)
+        continue;
+      expanded.push({
+        ...product,
+        product_id: bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? (product == null ? void 0 : product.product_id),
+        num: bundle.num ?? bundle.quantity ?? (product == null ? void 0 : product.num),
+        product_quantity: bundle.quantity ?? bundle.num ?? (product == null ? void 0 : product.product_quantity),
+        original_price: bundle.original_price ?? bundle.product_price ?? bundle.price,
+        selling_price: bundle.bundle_selling_price ?? bundle.price,
+        is_charge_tax: bundle.is_charge_tax ?? (product == null ? void 0 : product.is_charge_tax),
+        discount_list: bundle.discount_list
+      });
+    }
+  }
+  return expanded;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  expandHydratedProductsForDiscountCollection,
+  restoreHydratedBundleDiscounts
+});

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

@@ -254,6 +254,10 @@ export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrde
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
+export declare function getRuntimeProductOrigin(tempOrder: OrderTempOrder | null | undefined, product: any): Record<string, any> | null;
+export declare function isHolderConfigRequired(holderConfig: any): boolean;
+export declare function productRequiresFormSubject(tempOrder: OrderTempOrder | null | undefined, product: any): boolean;
+export declare function resolveIsFormSubject(tempOrder: OrderTempOrder | null | undefined, product?: any): boolean;
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。
  *

package/lib/modules/Order/utils.js

@@ -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,
@@ -376,6 +380,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 || {};
@@ -671,6 +711,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 +727,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,
@@ -700,7 +746,8 @@ function formatSubmitBundleItems(bundle) {
       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),
       metadata: {
-        ...existedMetadata,
+        ...submitMetadata,
+        ...hasSubmitBundleDiscounts && bundleMapId !== void 0 ? { custom_product_bundle_map_id: bundleMapId } : {},
         surcharge_fee: surchargeFee,
         relation_surcharge_ids: relationSurchargeIds,
         product_discount_difference: productDiscountDifference
@@ -765,7 +812,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 已减整单折扣均摊）。
@@ -1094,6 +1141,37 @@ 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) {
+  const runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired(product == null ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin == null ? void 0 : runtimeOrigin.holder_config);
+}
+function resolveIsFormSubject(tempOrder, product) {
+  var _a;
+  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;
@@ -1174,9 +1252,11 @@ function indexOrderProductsByUid(products) {
   getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
+  getRuntimeProductOrigin,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isHolderConfigRequired,
   isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
@@ -1190,7 +1270,9 @@ function indexOrderProductsByUid(products) {
   normalizeProductSkuOptions,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  productRequiresFormSubject,
   resolveEffectivePerUnitDiscount,
+  resolveIsFormSubject,
   resolveManualDiscountMessage,
   resolveManualDiscountOriginTotal,
   resolveManualDiscountReasonFromSources,

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -24,7 +24,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;

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,6 +207,7 @@ 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 editModeDiscount = [];
     const addModeDiscount = [];
@@ -596,7 +597,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
@@ -767,7 +768,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

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

@@ -22,6 +22,7 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
+export type RulesFormSubject = boolean | ((product: any) => boolean);
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -31,7 +32,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }) => DiscountResult;
 }

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