@pisell/pisellos 2.2.260 → 2.2.262

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -136,12 +136,23 @@ function resolveProductTitle(product, booking, sourceProduct) {
   const metadata = product.metadata || {};
   return (sourceProduct == null ? void 0 : sourceProduct.title) ?? (sourceProduct == null ? void 0 : sourceProduct.name) ?? metadata.product_title ?? metadata.product_name ?? ((_a = booking == null ? void 0 : booking.product) == null ? void 0 : _a.title) ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.product_title) ?? "";
 }
+function resolveProductCover(product, booking, sourceProduct) {
+  return (sourceProduct == null ? void 0 : sourceProduct.cover) ?? product.product_cover ?? "";
+}
 function resolveMainProductPrice(product, fallback) {
   const metadata = product.metadata || {};
   const value = metadata.main_product_original_price ?? metadata.source_product_price;
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map((item) => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -187,11 +198,14 @@ function buildCacheItemFromOrderLine(input) {
   const capacity = resolveCapacityFromBooking(booking);
   const holderId = ((_a = booking.metadata) == null ? void 0 : _a.holder_id) ?? booking.holder_id;
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
+  const productCover = resolveProductCover(product, booking, sourceProduct);
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
-    bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
+    bundle: mapOrderBundleToOtherBundle(
+      Array.isArray(product.product_bundle) ? product.product_bundle : []
+    )
   };
   const extend = {
     start_date: startDate ? (0, import_dayjs.default)(startDate) : void 0,
@@ -204,6 +218,7 @@ function buildCacheItemFromOrderLine(input) {
     sub_type: booking.sub_type,
     quantity: product.num ?? 1,
     product_name: productTitle,
+    product_cover: productCover,
     note: product.note ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.note) ?? "",
     price: mainProductPrice,
     total: selling,

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -136,6 +136,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     product_id: resolvedId,
     _id: uid,
     title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? product.product_title ?? "",
+    cover: (sourceProduct == null ? void 0 : sourceProduct.cover) ?? product.product_cover ?? "",
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price,

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -48,7 +48,7 @@ export interface BookingResourceInput {
     capacity?: number;
     like_status?: string;
     metadata?: Record<string, any>;
-    children?: any[];
+    children?: BookingResourceInput[];
 }
 /** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
 export interface BookingCapacityMetadataItem {

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.js

@@ -88,6 +88,24 @@ function resolveDurationMinutes(value) {
   const n = Number(value);
   return Number.isNaN(n) ? void 0 : n;
 }
+function normalizeChildResource(child, parentFormId) {
+  const item = {
+    form_id: (child == null ? void 0 : child.form_id) ?? parentFormId,
+    relation_type: (child == null ? void 0 : child.relation_type) || "form",
+    relation_id: (child == null ? void 0 : child.relation_id) ?? (child == null ? void 0 : child.id),
+    capacity: child == null ? void 0 : child.capacity,
+    like_status: (child == null ? void 0 : child.like_status) || "common"
+  };
+  if ((child == null ? void 0 : child.metadata) !== void 0) {
+    item.metadata = { ...child.metadata };
+  }
+  if (Array.isArray(child == null ? void 0 : child.children)) {
+    item.children = child.children.map(
+      (nestedChild) => normalizeChildResource(nestedChild, item.form_id)
+    );
+  }
+  return item;
+}
 function flattenResources(cacheItem) {
   var _a;
   const resourceMap = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.resource) || {};
@@ -107,8 +125,11 @@ function flattenResources(cacheItem) {
       if ((r == null ? void 0 : r.metadata) !== void 0) {
         item.metadata = { ...r.metadata };
       }
-      if ((r == null ? void 0 : r.children) !== void 0)
-        item.children = r.children;
+      if (Array.isArray(r == null ? void 0 : r.children)) {
+        item.children = r.children.map(
+          (child) => normalizeChildResource(child, item.form_id)
+        );
+      }
       result.push(item);
     });
   });

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason, DiscountPrepareConfigResult } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -16,15 +16,18 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     getDiscountList(): Discount[];
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
+    private normalizePositiveNumberIds;
     loadPrepareConfig(params: {
         action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        with_available_wallet_flag?: 0 | 1;
+        with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
-    }): Promise<Discount[]>;
+    }): Promise<DiscountPrepareConfigResult>;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/lib/modules/Discount/index.js

@@ -91,23 +91,43 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   getOriginalDiscountList() {
     return this.store.originalDiscountList || [];
   }
+  normalizePositiveNumberIds(values) {
+    const ids = values.map((value) => Number(value)).filter((value) => Number.isFinite(value) && value > 0);
+    return Array.from(new Set(ids));
+  }
   async loadPrepareConfig(params) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     if (typeof params.order_id === "string" && params.order_id.startsWith("LOCAL_")) {
       params.order_id = void 0;
     }
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
-      params
+      {
+        ...params,
+        with_available_wallet_flag: params.with_available_wallet_flag ?? 1,
+        with_available_wallet_pass_flag: params.with_available_wallet_pass_flag ?? 1
+      }
     );
     const rawDiscountList = [
       ...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [],
       ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []
     ];
+    const availableWalletList = [
+      ...((_c = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _c.avaiable_wallet_list) || [],
+      ...((_d = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _d.available_wallet_list) || []
+    ];
+    const availableWalletPassList = ((_e = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _e.available_wallet_pass_list) || [];
+    const availableWalletIds = this.normalizePositiveNumberIds([
+      ...availableWalletList.map((item) => item == null ? void 0 : item.wallet_id),
+      ...availableWalletPassList.map((item) => item == null ? void 0 : item.product_id)
+    ]);
     const goodPassList = this.filterEnabledDiscountList(
       rawDiscountList
     ) || [];
-    return goodPassList;
+    return {
+      discountList: goodPassList,
+      availableWalletIds
+    };
   }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};

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

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -75,6 +75,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
+    private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -84,7 +86,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         unavailableReasonKey?: string | null;
         scannedDiscountList?: Discount[];
     }>;
-    applyDiscount(): void;
+    applyDiscount(options?: {
+        reapplyBookingDiscountProductUids?: string[];
+    }): void;
     /**
      * 注入促销评估器。
      *
@@ -152,12 +156,24 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private extractOrderIdFromSubmitResult;
     private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
+    private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -169,6 +185,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
     private calculatePaymentGapAmount;
+    private calculatePaymentOrderAmount;
     private calculatePaymentRoundingAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
@@ -186,6 +203,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;
@@ -219,6 +237,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -260,6 +280,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private buildTempOrderCustomer;
     private isCustomerBoundDiscount;
+    private shouldKeepCustomerBoundDiscountAfterCustomerChange;
     private productHasCustomerBoundDiscount;
     private shouldSkipDiscountCalculation;
     private clearCustomerBoundDiscounts;
@@ -301,13 +322,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    private confirmPendingVoucherPaymentsInList;
+    private discardPendingVoucherPaymentsFromList;
+    private prepareVoucherPaymentsForSubmit;
+    private applyPaymentLifecycleChange;
+    confirmPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
+    discardPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
      *
      * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
      * 视为 wallet pass；其它支付项保持不变。
      */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -407,6 +442,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
@@ -418,6 +454,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private runSubmitTempOrder;
@@ -488,6 +525,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * this.normalizeHydratedBookingHolder({ metadata: { holder: { form_record: [1] } } });
      */
     private normalizeHydratedBookingHolder;
+    /**
+     * 匿名 booking 没有服务端行 ID 时，商品侧已有的 booking_uid 就是唯一可用的强引用。
+     * 在统一规范化生成 UUID 前先复用它；已落库 booking 仍按 schedule_event_id 派生稳定 UID。
+     */
+    private seedAnonymousBookingUidsFromProducts;
     private normalizeTempOrderForRuntime;
     private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
@@ -497,5 +539,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
+    getVouchers(): any[];
 }
 export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';