@pisell/pisellos 2.2.181 → 2.2.183

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

@@ -0,0 +1,124 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/BookingContext/utils/timeSlices.ts
+var timeSlices_exports = {};
+__export(timeSlices_exports, {
+  findNextDuration: () => findNextDuration,
+  findNextSlice: () => findNextSlice,
+  getDurationValue: () => import_flexible.getDurationValue,
+  getEndDate: () => getEndDate,
+  sliceDayIntoFiveMinutes: () => sliceDayIntoFiveMinutes
+});
+module.exports = __toCommonJS(timeSlices_exports);
+var import_dayjs = __toESM(require("dayjs"));
+var import_flexible = require("./flexible");
+function sliceDayIntoFiveMinutes(config, isDay) {
+  const startTime = (0, import_dayjs.default)().startOf("day");
+  const endTime = (0, import_dayjs.default)().endOf("day");
+  const timeSlice = config && config.value || 5;
+  const timeSlices = [];
+  const durationSlicesBasedOnTime = [];
+  let currentTime = startTime;
+  if (isDay) {
+    let currentDay = 1;
+    while (currentDay <= 30) {
+      timeSlices.push({
+        label: currentTime.format("hh:mm A"),
+        value: currentTime.format("HH:mm")
+      });
+      durationSlicesBasedOnTime.push({
+        label: String(currentDay),
+        value: currentDay
+      });
+      currentDay += 1;
+    }
+    return { timeSlices, durationSlicesBasedOnTime };
+  }
+  while (currentTime.isBefore(endTime)) {
+    timeSlices.push({
+      label: currentTime.format("hh:mm A"),
+      value: currentTime.format("HH:mm")
+    });
+    const nextTime = currentTime.add(timeSlice, "minute");
+    const durationValue = nextTime.diff(startTime, "minute");
+    durationSlicesBasedOnTime.push({
+      label: String(durationValue),
+      value: durationValue
+    });
+    currentTime = nextTime;
+  }
+  return { timeSlices, durationSlicesBasedOnTime };
+}
+function findNextDuration(current, array, defaultValue) {
+  if (defaultValue !== void 0 && defaultValue !== null)
+    return defaultValue;
+  if (!array || array.length === 0)
+    return void 0;
+  for (let i = 0; i < array.length; i += 1) {
+    if (array[i].value === (current == null ? void 0 : current.value))
+      return array[i].value;
+  }
+  return array[0].value;
+}
+function findNextSlice(params) {
+  var _a;
+  const { timeSlices, index = 0, date = "" } = params;
+  const currentTimeValue = date || (0, import_dayjs.default)().format("HH:mm");
+  for (let i = 0; i < timeSlices.length; i += 1) {
+    if (timeSlices[i].value !== "now" && timeSlices[i].value >= currentTimeValue) {
+      return timeSlices[i].value;
+    }
+  }
+  return (_a = timeSlices[index]) == null ? void 0 : _a.value;
+}
+function getEndDate(startDate, duration, endDate, shopOpeningHours) {
+  if (duration === "flexible") {
+    let openingDate = (0, import_dayjs.default)(
+      `${startDate.format("YYYY-MM-DD")} ${shopOpeningHours || "23:59"}`
+    );
+    if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
+      openingDate = openingDate.add(1, "day");
+    }
+    if (!endDate)
+      return openingDate;
+    const endDateObj = (0, import_dayjs.default)(endDate);
+    if (endDateObj.isAfter(openingDate))
+      return openingDate;
+    return endDateObj;
+  }
+  return startDate.add(Number(duration), "minute");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findNextDuration,
+  findNextSlice,
+  getDurationValue,
+  getEndDate,
+  sliceDayIntoFiveMinutes
+});

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

@@ -24,6 +24,12 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
+    /**
+     * 查询客户列表但不写入 customerList / pagination 状态。
+     *
+     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+     */
+    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -75,7 +75,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number") {
+    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number" && options.initialState.pageSize > 1) {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = import_constants.DEFAULT_PAGE_SIZE;
@@ -152,6 +152,20 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.error
     );
   }
+  /**
+   * 查询客户列表但不写入 customerList / pagination 状态。
+   *
+   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+   */
+  async queryCustomerList(params = {}) {
+    const { customerList, total, page, pageSize } = await this.fetchCustomerListData(params);
+    return {
+      list: customerList,
+      total,
+      page,
+      pageSize
+    };
+  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -169,10 +183,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.total = total;
       this.store.hasMore = page * pageSize < total;
       this.store.customerList = (0, import_lodash_es.cloneDeep)(customerList);
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -192,6 +202,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loading = false;
       this.storeChange();
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
     }
   }
   /**
@@ -352,12 +366,13 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
-      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData({
+      const loadMoreParams = {
         skip: nextPage,
         num: this.store.pageSize,
         ...this.store.searchParams
         // 使用存储的搜索条件
-      });
+      };
+      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData(loadMoreParams);
       const updatedCustomerList = [...this.store.customerList, ...(0, import_lodash_es.cloneDeep)(newCustomers)];
       this.store.customerList = updatedCustomerList;
       this.store.currentPage = page;
@@ -372,10 +387,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
           hasMore: this.store.hasMore
         }
       );
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -396,6 +407,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loadingMore = false;
       this.storeChange();
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
     }
   }
   /**

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

@@ -110,6 +110,8 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询客户列表但不更新列表分页状态 */
+    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Discount/index.js

@@ -97,8 +97,12 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
+    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 goodPassList = this.filterEnabledDiscountList(
-      [...((_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) || []]
+      rawDiscountList
     ) || [];
     return goodPassList;
   }

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

@@ -140,6 +140,7 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -1,9 +1,9 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateProductInOrderParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -20,11 +20,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private rulesHooksOverride?;
     private orderHooks?;
     private otherParams?;
+    /** 评估器引用；由 SalesSdkProvider 注入，未注入时 applyPromotion 静默跳过 */
+    private promotionEvaluator;
+    /** 赠品选择 resolver；由 SDK host bridge 注入 */
+    private giftSelectResolver;
+    /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
+    private isApplyingPromotion;
+    /** 最近一次 applyPromotion 的未满足促销提示 */
+    private lastUnfulfilledPromotions;
+    /** 最近一次 applyPromotion 的赠品操作 diff（debug / SDK 读取使用） */
+    private lastGiftActions;
+    /**
+     * 是否将 tempOrder 写入 IndexedDB 草稿（orders store）。
+     * BigSale 弹窗等短生命周期场景通过 setEnableTempOrderPersist(false) 关闭。
+     */
+    private draftPersistEnabled;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
      * Only selected discounts get a non-zero value.
      */
     static populateSavedAmounts(productList: Array<Record<string, any>>, discountList: Array<Record<string, any>>): void;
+    private applyProductDiscountPrices;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -43,8 +59,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private createDefaultRulesHooks;
     loadDiscountConfig(params: {
         customerId: number;
-        action?: 'create';
-    }): Promise<void>;
+        action?: 'create' | 'edit';
+        orderId?: number;
+        apply?: boolean;
+    }): Promise<Discount[]>;
     getDiscountList(): Discount[];
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
@@ -52,34 +70,92 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type: 'server' | 'clientCalc';
         unavailableReason?: UnavailableReason;
         unavailableReasonKey?: string | null;
+        scannedDiscountList?: Discount[];
     }>;
     applyDiscount(): void;
+    /**
+     * 注入促销评估器。
+     *
+     * @example
+     * order.setPromotionEvaluator(appHelper.utils.promotionEvaluator);
+     */
+    setPromotionEvaluator(evaluator: OrderPromotionEvaluator | null): void;
+    /**
+     * 注入赠品选择 resolver。OS 需要补赠品时会 await 调用 resolver；缺省时跳过新增并 console.warn。
+     *
+     * @example
+     * order.setGiftSelectResolver(async (ctx) => {
+     *   // SDK 内部决定弹窗 or 自动选第一项，返回完整 OrderProduct[]
+     *   return giftSelectBridge.request(ctx);
+     * });
+     */
+    setGiftSelectResolver(resolver: OrderGiftSelectResolver | null): void;
+    /**
+     * 为商品目录追加促销标签，供上层 Sales 门面复用。
+     *
+     * @example
+     * const products = order.appendPromotionTags(catalogProducts);
+     */
+    appendPromotionTags<T extends Record<string, any>>(products: T[]): T[];
+    /**
+     * 应用购物车促销：计算 → 差异化赠品 → 写回 tempOrder.products → emit onPromotionApplied。
+     *
+     * 调用时机：写路径（add/update/remove/clear/setCustomer）末尾自动触发；外部一般无需手动调。
+     *
+     * 关键约束：
+     * - 不调用任何公开 CRUD API（如 removeProductFromOrder），全部内部 mutate tempOrder.products，避免事件风暴；
+     * - 用 `isApplyingPromotion` 防递归；
+     * - 多选项赠品依赖 giftSelectResolver，未注入则跳过且 console.warn；
+     * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
+     */
+    applyPromotion(): Promise<void>;
+    /** 最近一次 applyPromotion 输出的未满足促销列表 */
+    getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
+    /** 最近一次 applyPromotion 输出的赠品操作 diff */
+    getLastGiftActions(): OrderLastGiftActions | null;
     initTempOrder(params: {
         cacheId?: string;
         salesSummaryModuleName?: string;
     }): void;
-    private getTempOrderStorageKey;
-    private restoreTempOrderFromStorage;
+    /**
+     * 控制 IndexedDB 草稿（saveDraft）是否写入。
+     * localStorage 版 tempOrder 持久化已废弃，此方法仅影响 saveDraft。
+     *
+     * @example
+     * order.setEnableTempOrderPersist(false); // BigSale 弹窗：跳过 ~1s 的 dbUpdate
+     */
+    setEnableTempOrderPersist(enabled: boolean): void;
+    /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
+    isTempOrderPersistEnabled(): boolean;
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
     private ensureRequestUniqueIdempotencyToken;
+    private buildPaymentSyncIdempotencyToken;
     hasLocalDatabase(): boolean;
     private buildLocalOrderRecord;
     getLocalOrderByOrderId(orderId: number | string): Promise<Record<string, any> | null>;
     getLocalOrderByOrderNumber(orderNumber: string): Promise<Record<string, any> | null>;
     getLocalOrderByExternalSaleNumber(externalSaleNumber: string): Promise<Record<string, any> | null>;
     saveDraft(): Promise<void>;
+    private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
     private calculatePaymentTotal;
+    private normalizePaymentSource;
+    private updateTempOrderPaymentStatus;
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
+    private formatSummaryMetadataMoney;
+    private syncSummaryProductMetadata;
+    private calculateSummaryAmountGap;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;
     getTempOrder(): OrderTempOrder | null;
+    replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
     getOrderIdentity(): OrderIdentitySnapshot | null;
     getOrderSyncState(): OrderSyncState;
     getOrderAmountSnapshot(): OrderAmountSnapshot | null;
@@ -90,20 +166,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
+    private getBookingUniqueIdentificationNumber;
+    private findBookingIndexByUniqueIdentificationNumber;
+    private removeLinkedBookingsForProduct;
     private getSalesSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
     }): Promise<OrderSummary | null>;
     getOrderSummary(): Promise<OrderSummary>;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
+    syncTempOrderNoteToRemote(orderId: number | string, note: string): Promise<string>;
     getTempOrderNote(): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    private buildTempOrderCustomer;
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
     updateTempOrderCustomer(customer: UpdateTempOrderCustomerInput): OrderSnapshot['customer'];
@@ -148,8 +231,15 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
-    updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;
+    updateOrderProduct(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
+    updateOrderProductQuantity(params: UpdateOrderProductQuantityParams): Promise<OrderProduct[]>;
+    updateOrderBooking(params: UpdateOrderBookingParams): any[];
     removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    /**
+     * 仅清空购物车行（products / bookings），不重置整单。
+     * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
+     */
+    clearOrderCartLines(): Promise<OrderTempOrder>;
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -221,8 +311,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     hydrateTempOrderFromRecord(record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
+    private normalizeTempOrderForRuntime;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
 }
-export type { UpdateProductInOrderParams } from './types';
+export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';