@pisell/pisellos 0.0.568 → 0.0.569

package/lib/solution/BookingTicket/utils/sessionCatalogStale.js

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildSessionCatalogStaleInfo = buildSessionCatalogStaleInfo;
+exports.isSessionCatalogDateStale = isSessionCatalogDateStale;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const SESSION_EXTENSION_TYPES = ['session_product', 'session_ticket'];
+
+/**
+ * 是否为 session 商品。
+ *
+ * @example
+ * getIsSessionProduct({ extension_type: 'session_ticket' }); // true
+ */
+function getIsSessionProduct(product) {
+  return SESSION_EXTENSION_TYPES.includes(product?.extension_type);
+}
+
+/**
+ * 从 session 快照解析日历日 YYYY-MM-DD。
+ *
+ * @example
+ * resolveSessionCalendarDay({ start_at: '2026-06-05 10:00:00' }); // '2026-06-05'
+ */
+function resolveSessionCalendarDay(session) {
+  if (!session) return null;
+  const raw = session.start_at ?? session.end_at;
+  if (!raw) return null;
+  const parsed = (0, _dayjs.default)(raw);
+  return parsed.isValid() ? parsed.format('YYYY-MM-DD') : null;
+}
+
+/**
+ * 将 booking / TimeBar 日期规范为 YYYY-MM-DD。
+ *
+ * @example
+ * formatScheduleCalendarDay('2026-06-05 19:01:18'); // '2026-06-05'
+ */
+function formatScheduleCalendarDay(date) {
+  if (date == null || date === '') return null;
+  const parsed = (0, _dayjs.default)(date);
+  return parsed.isValid() ? parsed.format('YYYY-MM-DD') : null;
+}
+/**
+ * 判断 session 商品 catalog 中的 session 日历日是否与当前 TimeBar / bookingDate 不一致。
+ *
+ * @example
+ * isSessionCatalogDateStale(product, '2026-06-05 19:01:18');
+ * // session 为 2026-06-04 → true；一致或无 session 快照 → false
+ */
+function isSessionCatalogDateStale(product, bookingDate) {
+  if (!getIsSessionProduct(product)) {
+    return false;
+  }
+  const timeBarDay = formatScheduleCalendarDay(bookingDate);
+  if (!timeBarDay) {
+    return false;
+  }
+  const sessionDay = resolveSessionCalendarDay(product.cartDetailValue?.session);
+  if (!sessionDay) {
+    return false;
+  }
+  return sessionDay !== timeBarDay;
+}
+
+/**
+ * 组装 session catalog 日期不一致时的日志 metadata。
+ *
+ * @example
+ * buildSessionCatalogStaleInfo(product, '2026-06-05 19:01:18');
+ */
+function buildSessionCatalogStaleInfo(product, bookingDate) {
+  return {
+    productId: product?.id ?? null,
+    productTitle: product?.title ?? product?.name ?? null,
+    sessionDay: resolveSessionCalendarDay(product.cartDetailValue?.session),
+    timeBarDay: formatScheduleCalendarDay(bookingDate),
+    bookingDate
+  };
+}

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

@@ -305,6 +305,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      *
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
+    /** @deprecated */
     private cleanupExpiredOrdersAsync;
     /**
      * 清除计算缓存

package/lib/solution/Checkout/index.js

@@ -91,10 +91,11 @@ class CheckoutImpl extends _BaseModule.BaseModule {
     await this.initializeSubModules(core, options);
 
     // 预加载支付方式（利用缓存机制）
-    await this.preloadPaymentMethods();
+    // await this.preloadPaymentMethods();
 
     // 清理过期的已同步订单数据
-    await this.cleanupExpiredOrdersAsync();
+    // await this.cleanupExpiredOrdersAsync();
+
     await this.core.effects.emit(`${this.name}:onCheckoutInitialized`, {
       timestamp: Date.now()
     });
@@ -1945,42 +1946,37 @@ class CheckoutImpl extends _BaseModule.BaseModule {
     try {
       // 获取剩余待付金额
       const remainingAmountStr = await this.calculateRemainingAmountAsync();
-      let remainingAmount = new _decimal.default(remainingAmountStr);
+      const remainingAmount = new _decimal.default(remainingAmountStr);
       const cashAmount = new _decimal.default(String(paymentItem.amount));
+      const roundingAmount = new _decimal.default(String(paymentItem.rounding_amount || '0'));
 
       // 如果现金金额小于等于剩余待付金额，无需找零
       if (cashAmount.lte(remainingAmount)) {
         return paymentItem;
       }
 
-      // 使用 Decimal.js 安全计算找零金额
-      const changeAmount = cashAmount.sub(remainingAmount);
-
-      // 如果还有 rounding_amount 的配置，要判断是否和 changeAmount 相等
-      if (Number(paymentItem.rounding_amount) > 0) {
-        if (Number(paymentItem.rounding_amount) === changeAmount.toNumber()) {
-          return paymentItem;
-        } else {
-          // 如果不等于，则remainingAmount需要加上 rounding_amount，避免这里被改为未舍入金额
-          remainingAmount = remainingAmount.add(new _decimal.default(paymentItem.rounding_amount || '0'));
-        }
+      // 超付场景使用 rounding 回算应收金额（兼容 UI 已做抹零 + 允许超付）
+      const chargeAmount = _decimal.default.max(remainingAmount.add(roundingAmount), new _decimal.default(0));
+      if (cashAmount.lte(chargeAmount)) {
+        return paymentItem;
       }
+      const changeAmount = cashAmount.sub(chargeAmount);
 
       // 创建包含找零信息的支付项
       const processedPaymentItem = {
         ...paymentItem,
-        amount: remainingAmount.toFixed(2),
-        // 将 amount 设置为剩余待付金额，保留2位小数
+        amount: chargeAmount.toFixed(2),
         metadata: {
           ...paymentItem.metadata,
           actual_paid_amount: cashAmount.toNumber(),
-          // 实付金额
-          change_given_amount: changeAmount.toNumber() // 找零金额
+          change_given_amount: changeAmount.toNumber()
         }
       };
       this.logInfo('Cash payment with change processed', {
         originalAmount: cashAmount.toFixed(2),
-        chargedAmount: remainingAmount.toFixed(2),
+        remainingAmount: remainingAmount.toFixed(2),
+        roundingAmount: roundingAmount.toFixed(2),
+        chargedAmount: chargeAmount.toFixed(2),
         changeAmount: changeAmount.toFixed(2),
         paymentCode: paymentItem.code,
         paymentType: paymentItem.type,
@@ -1988,6 +1984,8 @@ class CheckoutImpl extends _BaseModule.BaseModule {
         decimalPrecisionCheck: {
           cashAmountPrecise: cashAmount.toString(),
           remainingAmountPrecise: remainingAmount.toString(),
+          roundingAmountPrecise: roundingAmount.toString(),
+          chargeAmountPrecise: chargeAmount.toString(),
           changeAmountPrecise: changeAmount.toString()
         }
       });
@@ -2017,6 +2015,7 @@ class CheckoutImpl extends _BaseModule.BaseModule {
    *
    * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
    */
+  /** @deprecated */
   async cleanupExpiredOrdersAsync() {
     try {
       // 检查是否启用了清理功能

package/lib/solution/Checkout/utils/index.js

@@ -53,10 +53,10 @@ function validateCheckoutData(params) {
     });
   }
 
-  // 验证订单类型
-  if (params.orderType && !['virtual', 'appointment_booking'].includes(params.orderType)) {
-    errors.push('订单类型无效，必须是 virtual 或 appointment_booking');
-  }
+  // // 验证订单类型
+  // if (params.orderType && !['virtual', 'appointment_booking'].includes(params.orderType)) {
+  //   errors.push('订单类型无效，必须是 virtual 或 appointment_booking');
+  // }
 
   // 验证平台类型
   if (params.platform && !['pc', 'h5'].includes(params.platform)) {

package/lib/solution/RegisterAndLogin/config.js

@@ -589,11 +589,7 @@ const webposConfig = {
       // withCredentials: true,
       prefix: false,
       isDefaultSaasDomain: true,
-      cache: {
-        mode: "remote_local",
-        type: "indexDB",
-        cacheKeyData: values
-      }
+      cache: false
     })
   },
   emailCodeRegister: {
@@ -856,11 +852,7 @@ const shopWebposConfig = {
     options: values => ({
       // withCredentials: true,
       prefix: false,
-      cache: {
-        mode: "remote_local",
-        type: "indexDB",
-        cacheKeyData: values
-      }
+      cache: false
     })
   },
   emailCodeRegister: {

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

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import type { RequestPlugin } from '../../plugins/request';
-import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesTimelineHighlights } from './types';
+import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams } from './types';
 import type { BookingData } from '../../server/modules/order/types';
 export * from './types';
 /**
@@ -14,6 +14,7 @@ export * from './types';
  * - 基础生命周期占位
  *
  * 不提前实现 store 编排、初始化流程细节、状态计算逻辑。
+ * TIPS：这块应该改名叫 ReservationModule 更合适一些，目前这边只服务于 Reservation 的 floormap 展示。
  */
 export declare class SalesImpl extends BaseModule implements Module, SalesModuleAPI {
     protected defaultName: string;
@@ -24,6 +25,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     protected options: ModuleOptions;
     protected otherParams: Record<string, any>;
     protected request: RequestPlugin;
+    private logger;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /** 获取当前 store 快照 */
@@ -38,6 +40,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     setReservationList(reservationList: Reservation[]): Reservation[];
     /** 重置预约列表为空 */
     resetReservationList(): Reservation[];
+    cancelOrder(orderIds: Array<number | string>): Promise<any>;
+    changeBookingStatus(params: ChangeBookingStatusParams): Promise<any>;
     destroy(): Promise<void>;
     /**
      * 时间轴粒度（分钟）
@@ -76,6 +80,14 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getBookingStatus;
     private getResourceId;
+    private getBookingAppointmentStatus;
+    private isBookingIncludedInStats;
+    private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
+    private isBookingMatchedResource;
+    private sortMatchedBookings;
     /**
      * 资源下 bookings 的返回裁剪策略：
      * 1) 优先返回当前时刻正在进行中的预约（允许并发返回多条）
@@ -85,12 +97,45 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private pickBookingsForCurrentPoint;
     /**
-     * 标准化单条 booking：
-     * - 过滤终态（rejected/cancelled/completed）
-     * - 注入 status / isTimeout / reserved_status
+     * 计算 booking 在 current 时刻的执行进度百分比（0-100）。
+     * - startAt/endAt 非法或 totalMinutes <= 0 返回 0
+     * - current 早于 startAt 返回 0，晚于 endAt 返回 100
+     */
+    private calcProgressPercent;
+    /**
+     * 标准化单条 booking 的分发入口：
+     * - 统一过滤 rejected / cancelled（视为没来过）
+     * - current === deviceCurrent 走实时分支（信任 appointment_status）
+     * - 否则走快照分支（纯时间窗判定，忽略 appointment_status 的 arrived/started/completed 差异）
      */
     private normalizeMatchedBooking;
-    getResourceBookingList(currentTime: string, bookingList?: BookingData[]): Promise<SalesResourceBookingItem[]>;
+    private normalizeResourceBookings;
+    private buildCompletedBooking;
+    /**
+     * 实时模式（current === deviceCurrent）：信任 appointment_status
+     * - 过滤 new / completed（实时视角下视为非活跃数据）
+     * - status 由 getBookingStatus 映射
+     * - occupied 且 current > endAt 标记 isTimeout + timeoutTime
+     * - reserved 且 current < startAt 标记 not_arrived，否则标记 late
+     */
+    private buildRealtimeBooking;
+    /**
+     * 快照模式（current !== deviceCurrent，过去或未来）：忽略 appointment_status
+     * 的实时态差异，仅按 booking 时间窗判定，为 current 提供时间点快照视图。
+     *
+     * - new：视作尚未成为真实预约，过滤
+     * - locked：保留 status=locked，不计算 timeout/late/progress
+     * - 其他非终态：
+     *   - startAt/endAt 非法 → 过滤
+     *   - current > endAt → 过滤（已结束，不入池）
+     *   - current ∈ [startAt, endAt] → occupied，附带 progressPercent
+     *   - current < startAt → reserved + not_arrived，附带 remainingReserveTime
+     *
+     * 快照模式下 isTimeout 恒为 false，lateTime / timeoutTime 始终置空。
+     */
+    private buildSnapshotBooking;
+    getResourceBookingList(currentTime: string, bookingList?: BookingData[], deviceTime?: string): Promise<SalesResourceBookingItem[]>;
+    getResourceBookingItem(params: GetResourceBookingItemParams): Promise<SalesResourceBookingItemWithGroups | null>;
 }
 export { SalesImpl as Sales };
 export default SalesImpl;