@pisell/pisellos 2.3.7 → 2.3.9

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.js

@@ -380,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 || {};
@@ -675,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;
@@ -687,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,
@@ -704,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
@@ -769,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 已减整单折扣均摊）。

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

@@ -46,6 +46,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected hasManualDiscountSelection: boolean;
     private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
+    private queuedAutoPaymentSync;
+    private autoPaymentSyncFlushing;
+    private autoPaymentSyncTimer;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -195,6 +198,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -207,12 +211,14 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -222,6 +228,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderPayments(): OrderPaymentData[];
     /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getPaymentStatusForSync;
+    private queueLatestAutoPaymentSync;
+    private scheduleQueuedAutoPaymentSyncFlush;
+    private flushQueuedAutoPaymentSync;
     /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
     /** 更新当前订单中的指定支付项。 */
@@ -229,7 +239,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
+    confirmPendingVoucherPayments(): OrderPaymentData[];
+    discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;

package/lib/solution/BaseSales/index.js

@@ -156,6 +156,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.hasManualDiscountSelection = false;
     this.reusedSharedSubModuleNames = /* @__PURE__ */ new Set();
     this.paymentMethodsCache = [];
+    this.queuedAutoPaymentSync = false;
+    this.autoPaymentSyncFlushing = false;
+    this.autoPaymentSyncTimer = null;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -165,10 +168,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return ["products", "order", "salesSummary", "schedule", "payment", "quotation"];
   }
   getReusableSharedSubModule(moduleName) {
-    var _a;
+    var _a, _b;
     if (moduleName !== "schedule" && moduleName !== "quotation")
       return null;
-    return ((_a = this.core) == null ? void 0 : _a.getModule(moduleName)) || null;
+    return ((_b = (_a = this.core) == null ? void 0 : _a.getModule) == null ? void 0 : _b.call(_a, moduleName)) || null;
   }
   isScheduleListLoaded(scheduleModule) {
     if (!scheduleModule)
@@ -1283,6 +1286,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
                 d.isManualSelect = true;
+                d.appliedProductDetails = [];
               }
             }
           }
@@ -1291,16 +1295,32 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const selectedResourceIds = new Set(
         nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
       );
+      const filterSelectedDiscountDetails = (discountList) => (discountList || []).filter((pd) => {
+        var _a2;
+        const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+        return rid != null && selectedResourceIds.has(rid);
+      });
       for (const product of tempOrder.products) {
         const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
         const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
-        product.discount_list = (product.discount_list || []).filter((pd) => {
-          var _a2;
-          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
-          return rid != null && selectedResourceIds.has(rid);
-        });
+        product.discount_list = filterSelectedDiscountDetails(product.discount_list);
+        if (Array.isArray(product.product_bundle)) {
+          product.product_bundle = product.product_bundle.map((bundle) => {
+            const nextBundleDiscountList = filterSelectedDiscountDetails(bundle == null ? void 0 : bundle.discount_list);
+            const shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
+            const restoredBundlePrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
+            return {
+              ...bundle,
+              ...shouldRestoreBundlePrice ? {
+                price: restoredBundlePrice,
+                bundle_selling_price: restoredBundlePrice
+              } : {},
+              discount_list: nextBundleDiscountList
+            };
+          });
+        }
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
           (sum, pd) => sum + (pd.amount || 0),
           0
@@ -1389,6 +1409,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrder(submitParams);
@@ -1408,6 +1429,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
+      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -1476,6 +1498,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     const syncState = this.store.order.getOrderSyncState();
     if (params.submitWhenPaid && syncState === "submitting") {
+      this.queueLatestAutoPaymentSync();
       return this.store.order.syncPaymentsToOrder(syncParams);
     }
     const payments = params.payments || [];
@@ -1508,6 +1531,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid) {
         await this.effectsEmit(import_types.BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
       }
+      this.scheduleQueuedAutoPaymentSyncFlush(0);
       return syncResult;
     } catch (error) {
       await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
@@ -1518,6 +1542,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         amountSnapshot: this.store.order.getOrderAmountSnapshot(),
         orderSnapshot: this.store.order.getOrderSnapshot()
       });
+      this.scheduleQueuedAutoPaymentSyncFlush(0);
       throw error;
     }
   }
@@ -1534,6 +1559,61 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.setOrderPayments(payments);
   }
+  getPaymentStatusForSync(payments) {
+    const order = this.store.order;
+    if (!order)
+      throw new Error("order 模块未初始化");
+    const completion = order.getPaymentCompletion(payments);
+    return completion.isOrderFullyPaid ? "paid" : "partially_paid";
+  }
+  queueLatestAutoPaymentSync() {
+    this.queuedAutoPaymentSync = true;
+    this.scheduleQueuedAutoPaymentSyncFlush();
+  }
+  scheduleQueuedAutoPaymentSyncFlush(delay = 100) {
+    if (!this.queuedAutoPaymentSync)
+      return;
+    if (this.autoPaymentSyncTimer)
+      return;
+    this.autoPaymentSyncTimer = setTimeout(() => {
+      this.autoPaymentSyncTimer = null;
+      void this.flushQueuedAutoPaymentSync();
+    }, delay);
+  }
+  async flushQueuedAutoPaymentSync() {
+    if (!this.store.order)
+      return;
+    if (!this.queuedAutoPaymentSync || this.autoPaymentSyncFlushing)
+      return;
+    if (this.store.order.getOrderSyncState() === "submitting") {
+      this.scheduleQueuedAutoPaymentSyncFlush();
+      return;
+    }
+    this.autoPaymentSyncFlushing = true;
+    try {
+      while (this.queuedAutoPaymentSync) {
+        this.queuedAutoPaymentSync = false;
+        const payments = this.store.order.getOrderPayments();
+        if (!payments.length)
+          continue;
+        await this.syncPaymentsToOrder({
+          payments,
+          paymentStatus: this.getPaymentStatusForSync(payments),
+          submitWhenPaid: true,
+          smallTicketDataFlag: 1
+        });
+      }
+    } catch (error) {
+      this.logError("queued auto sync payments failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    } finally {
+      this.autoPaymentSyncFlushing = false;
+      if (this.queuedAutoPaymentSync) {
+        this.scheduleQueuedAutoPaymentSyncFlush(0);
+      }
+    }
+  }
   /** 追加单个支付项到当前订单。 */
   addOrderPayment(payment) {
     var _a;
@@ -1569,12 +1649,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
-    if (amountSnapshot && syncState !== "submitting") {
-      const completion = this.store.order.getPaymentCompletion(payments);
-      const paymentStatus = completion.isOrderFullyPaid ? "paid" : "partially_paid";
+    if (amountSnapshot) {
+      if (syncState === "submitting") {
+        this.queueLatestAutoPaymentSync();
+        return payments;
+      }
       void this.syncPaymentsToOrder({
         payments,
-        paymentStatus,
+        paymentStatus: this.getPaymentStatusForSync(payments),
         submitWhenPaid: true,
         smallTicketDataFlag: 1
       }).catch((error) => {
@@ -1582,7 +1664,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           error: error instanceof Error ? error.message : String(error)
         });
       });
-    } else {
     }
     return payments;
   }
@@ -1599,10 +1680,20 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.deleteOrderPayment(paymentIdentity);
   }
   /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-  updateVoucherOrderPayments(payments) {
+  updateVoucherOrderPayments(payments, options) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateVoucherOrderPayments(payments, options);
+  }
+  confirmPendingVoucherPayments() {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.confirmPendingVoucherPayments();
+  }
+  discardPendingVoucherPayments() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.updateVoucherOrderPayments(payments);
+    return this.store.order.discardPendingVoucherPayments();
   }
   getWalletProductList() {
     var _a, _b, _c;

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

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

package/package.json

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