@pisell/pisellos 2.3.8 → 2.3.9

package/dist/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 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -458,7 +458,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -79,6 +79,9 @@ function isPendingVoucherPaymentRecord(payment) {
 function isPaidPaymentRecord(payment) {
   return (payment == null ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
 }
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -2541,25 +2544,39 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const nonVoucherPayments = (tempOrder.payments || []).filter((payment) => {
       return !isVoucherPaymentRecord(payment);
     });
-    const syncedVoucherPayments = (tempOrder.payments || []).filter((payment) => {
-      return isVoucherPaymentRecord(payment) && hasSyncedOrderPaymentRecord(payment);
-    });
-    const syncedVoucherPaymentIds = new Set(
-      syncedVoucherPayments.map((payment) => String(payment.order_payment_id))
+    const normalizeCommittedVoucherPayment = (payment) => {
+      if (hasSyncedOrderPaymentRecord(payment) && (payment.status === void 0 || payment.status === "active")) {
+        return {
+          ...payment,
+          status: ORDER_PAYMENT_STATUS_PAID
+        };
+      }
+      return payment;
+    };
+    const committedVoucherPayments = (tempOrder.payments || []).filter((payment) => isCommittedVoucherPaymentRecord(payment)).map((payment) => normalizeCommittedVoucherPayment(payment));
+    const committedVoucherPaymentIds = new Set(
+      committedVoucherPayments.filter((payment) => hasSyncedOrderPaymentRecord(payment)).map((payment) => String(payment.order_payment_id))
+    );
+    const committedVoucherIds = new Set(
+      committedVoucherPayments.map((payment) => String(payment.voucher_id))
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
-      if (!hasSyncedOrderPaymentRecord(payment))
-        return true;
-      return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+      if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+        return false;
+      }
+      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+        return false;
+      }
+      return true;
     });
     const cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
       vouchers: replaceableVouchers,
       nonVoucherPayments: [
         ...nonVoucherPayments,
-        ...syncedVoucherPayments
+        ...committedVoucherPayments
       ]
     });
-    tempOrder.payments = [...nonVoucherPayments, ...syncedVoucherPayments, ...cappedVouchers];
+    tempOrder.payments = [...nonVoucherPayments, ...committedVoucherPayments, ...cappedVouchers];
     this.updateTempOrderPaymentStatus(tempOrder);
     this.persistTempOrder();
     void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
@@ -3371,7 +3388,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...hasPaymentOverride ? {
           payments: preparedPaymentOverride || []
         } : {},
-        ...hasPaymentStatusOverride ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
+        ...hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? { payment_status: params == null ? void 0 : params.paymentStatus } : {},
         ...hasSmallTicketDataFlagOverride ? { small_ticket_data_flag: params == null ? void 0 : params.smallTicketDataFlag } : {}
       };
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;

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);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -225,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[];
     /** 更新当前订单中的指定支付项。 */

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;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -1495,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 || [];
@@ -1527,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, {
@@ -1537,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;
     }
   }
@@ -1553,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;
@@ -1588,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) => {
@@ -1601,7 +1664,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           error: error instanceof Error ? error.message : String(error)
         });
       });
-    } else {
     }
     return payments;
   }

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 | 3 | 4 | 5 | 6;
+        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.8",
+  "version": "2.3.9",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",