@pisell/pisellos 2.2.222 → 2.2.224

package/lib/modules/Order/index.js

@@ -243,11 +243,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
     this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
-    this.orderHooks = options.hooks || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
+    this.moduleHooksOverride = options.hooks;
+    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，并同步 Order 内部依赖的派生字段。
+   *
+   * @example
+   * orderModule.updateOtherParams({ cacheId: 'cache-2', channel: 'pos' });
+   */
+  updateOtherParams(params) {
+    var _a, _b, _c;
+    const otherParams = params || {};
+    this.cacheId = otherParams.cacheId;
+    this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
+    this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
+    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
+    this.otherParams = otherParams;
+  }
   /**
    * 记录信息日志
    */
@@ -1438,6 +1454,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     productMetadata.unique_identification_number = productUid;
     bookingMetadata.unique_identification_number = bookingUid;
+    this.syncBookingMetadataHolder(params.booking, bookingMetadata);
     return {
       productUid,
       bookingUid,
@@ -1459,6 +1476,110 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
+  /**
+   * booking.holder 是提交真源；metadata.holder 作为详情/回显冗余字段同步保存。
+   *
+   * @example
+   * this.syncBookingMetadataHolder(booking, metadata);
+   */
+  syncBookingMetadataHolder(booking, metadata) {
+    if ((booking == null ? void 0 : booking.holder) !== void 0) {
+      metadata.holder = booking.holder;
+    }
+  }
+  /**
+   * 从单条 booking 的 holder / metadata 中收集 holder form_record。
+   *
+   * @example
+   * const ids = this.collectBookingHolderRecords(booking);
+   */
+  collectBookingHolderRecords(booking) {
+    var _a;
+    const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+    const source = (holder == null ? void 0 : holder.form_record) ?? ((_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.holder_id);
+    const records = Array.isArray(source) ? source : [source];
+    return records.filter((record) => record !== void 0 && record !== null && record !== "");
+  }
+  /**
+   * 按 form_record 顺序读取 booking holder 的主字段名称。
+   *
+   * @example
+   * const names = this.collectBookingHolderNames(booking);
+   */
+  collectBookingHolderNames(booking) {
+    const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+    const rawName = holder == null ? void 0 : holder.name;
+    if (Array.isArray(rawName)) {
+      return rawName.map((name) => String(name || "").trim());
+    }
+    if (typeof rawName === "string") {
+      return rawName.split(",").map((name) => name.trim());
+    }
+    return [];
+  }
+  /**
+   * 按老 ticketBooking `formatHolder` 语义汇总订单顶层 holder。
+   *
+   * @example
+   * const holder = this.buildTempOrderHolderFromBookings(tempOrder);
+   */
+  buildTempOrderHolderFromBookings(tempOrder) {
+    var _a, _b;
+    const holderRecords = [];
+    const holderNames = [];
+    let baseHolder = null;
+    const seen = /* @__PURE__ */ new Set();
+    for (const booking of tempOrder.bookings || []) {
+      const holder = (booking == null ? void 0 : booking.holder) && typeof booking.holder === "object" ? booking.holder : null;
+      if (!baseHolder && holder) {
+        baseHolder = holder;
+      }
+      const records = this.collectBookingHolderRecords(booking);
+      const names = this.collectBookingHolderNames(booking);
+      for (const [index, record] of records.entries()) {
+        const key = String(record);
+        if (seen.has(key))
+          continue;
+        seen.add(key);
+        holderRecords.push(record);
+        if (names[index]) {
+          holderNames.push(names[index]);
+        }
+      }
+    }
+    if (!holderRecords.length) {
+      return null;
+    }
+    const nextHolder = {
+      customer_id: (baseHolder == null ? void 0 : baseHolder.customer_id) ?? tempOrder.customer_id,
+      form_id: (baseHolder == null ? void 0 : baseHolder.form_id) ?? ((_a = tempOrder.holder) == null ? void 0 : _a.form_id) ?? 0,
+      form_record: holderRecords
+    };
+    if (holderNames.length) {
+      nextHolder.name = holderNames.join(",");
+    }
+    if ((baseHolder == null ? void 0 : baseHolder.is_source_shop) || ((_b = this.otherParams) == null ? void 0 : _b.isFranchisee)) {
+      nextHolder.is_source_shop = 1;
+    }
+    return nextHolder;
+  }
+  /**
+   * 将 booking 级 holder 汇总到 tempOrder 顶层 holder。
+   *
+   * @example
+   * this.syncTempOrderHolderFromBookings(tempOrder);
+   */
+  syncTempOrderHolderFromBookings(tempOrder) {
+    const bookings = tempOrder.bookings || [];
+    const hasHolderSource = bookings.some((booking) => {
+      var _a;
+      return (booking == null ? void 0 : booking.holder) !== void 0 || ((_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.holder_id) !== void 0;
+    });
+    const nextHolder = this.buildTempOrderHolderFromBookings(tempOrder);
+    if (nextHolder || hasHolderSource || bookings.length === 0) {
+      tempOrder.holder = nextHolder;
+    }
+  }
   getBookingUniqueIdentificationNumber(booking) {
     var _a;
     const uid = (_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.unique_identification_number;
@@ -1996,6 +2117,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.finalizeProductOrderMutation(tempOrder);
    */
   async finalizeProductOrderMutation(tempOrder) {
+    this.syncTempOrderHolderFromBookings(tempOrder);
     await this.ensureEditDiscountConfigForProductChange(tempOrder);
     await this.applyPromotion();
     this.applyDiscount();
@@ -2028,7 +2150,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasIncomingGoodPass = this.hasGoodPassDiscount(
       normalizedIncoming
     );
-    const shouldForceNewLine = !!booking;
+    const hasIncomingProductNote = typeof normalizedIncoming.note === "string" && normalizedIncoming.note.trim().length > 0;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       if (this.hasGoodPassDiscount(item))
         return false;
@@ -2294,7 +2417,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
     const callerChangesDiscountList = Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
     const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || callerChangesDiscountList;
-    if (isPersistedOrderLine && !callerUpdatesManualPrice) {
+    const callerAllowsBookingReprice = (() => {
+      if (params.allow_booking_reprice !== true || !booking || !callerUpdatesTopPrice || !callerUpdatesMainMeta) {
+        return false;
+      }
+      const hasChangedPrice = (nextValue, currentValue) => {
+        if (nextValue === void 0 || nextValue === null || nextValue === "") {
+          return false;
+        }
+        return !new import_decimal.default(Number(nextValue) || 0).equals(
+          new import_decimal.default(Number(currentValue) || 0)
+        );
+      };
+      return hasChangedPrice(updates.selling_price, targetProduct.selling_price) || hasChangedPrice(updates.original_price, targetProduct.original_price);
+    })();
+    if (isPersistedOrderLine && !callerUpdatesManualPrice && !callerAllowsBookingReprice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
       nextProduct.payment_price = targetProduct.payment_price;
@@ -2360,6 +2497,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
     }
     tempOrder.products[productIndex] = normalizedProduct;
+    this.syncTempOrderHolderFromBookings(tempOrder);
     this.captureProductRuntime(
       tempOrder,
       updates,
@@ -2458,9 +2596,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         unique_identification_number: bookingUid
       }
     };
+    this.syncBookingMetadataHolder(nextBooking, nextBooking.metadata);
     nextBooking.is_all = (0, import_utils.normalizeBookingIsAll)(nextBooking);
     nextBooking.sub_type = (0, import_utils.normalizeBookingSubType)(nextBooking);
     tempOrder.bookings[bookingIndex] = nextBooking;
+    this.syncTempOrderHolderFromBookings(tempOrder);
     this.persistTempOrder();
     return tempOrder.bookings;
   }
@@ -2472,6 +2612,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.finalizeAfterProductsMutation(tempOrder);
    */
   async finalizeAfterProductsMutation(tempOrder) {
+    this.syncTempOrderHolderFromBookings(tempOrder);
     await this.applyPromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
@@ -2513,6 +2654,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = this.ensureTempOrder();
     tempOrder.products = [];
     tempOrder.bookings = [];
+    this.syncTempOrderHolderFromBookings(tempOrder);
     if (tempOrder._extend && typeof tempOrder._extend === "object") {
       tempOrder._extend = {
         ...tempOrder._extend,

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

@@ -309,6 +309,19 @@ export interface UpdateOrderProductParams {
     product_sku?: OrderProductSku;
     product_bundle?: any[];
     booking?: AddProductBookingInput;
+    /**
+     * 预约时间 / 时长变更后允许使用本次报价覆盖已落库订单行历史价。
+     *
+     * @example
+     * await order.updateOrderProduct({
+     *   product_id: 1,
+     *   product_variant_id: 0,
+     *   updates: { selling_price: '6.00', metadata: { source_product_price: '6.00' } },
+     *   booking: { duration: 2 },
+     *   allow_booking_reprice: true,
+     * });
+     */
+    allow_booking_reprice?: boolean;
 }
 /** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
 export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
@@ -436,6 +449,8 @@ export interface PaymentItemData {
     type: string;
     /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
     payment_time?: string;
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    created_at?: string;
     /** @deprecated BaseSales/Sales 协议不提交该字段；旧 Checkout/Payment 内部仍可能使用 */
     isSynced?: boolean;
 }
@@ -470,6 +485,7 @@ export interface OrderPaymentData {
         amount?: string;
     };
     order_payment_type?: 'normal' | 'deposit';
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss) */
     created_at?: string;
     updated_at?: string;
 }

package/lib/modules/Order/utils.js

@@ -608,7 +608,8 @@ var SUBMIT_BOOKING_METADATA_WHITELIST = [
   "collect_pax",
   "capacity",
   "holder_id",
-  "resource_select_type"
+  "resource_select_type",
+  "holder"
 ];
 function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === "1" || booking.is_all === "true" ? 1 : 0;
@@ -818,7 +819,9 @@ function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
-  const paymentTime = item.payment_time ?? (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+  const timestamp = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+  const paymentTime = item.payment_time ?? timestamp;
+  const createdAt = item.created_at ?? timestamp;
   return {
     ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
     amount: String(item.amount ?? "0.00"),
@@ -831,6 +834,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     ...item.service_fee !== void 0 ? { service_fee: String(item.service_fee) } : {},
     ...item.status !== void 0 ? { status: item.status } : {},
     payment_time: paymentTime,
+    created_at: createdAt,
     ...item.wallet_pass_usage_unit !== void 0 ? { wallet_pass_usage_unit: item.wallet_pass_usage_unit } : {},
     ...item.wallet_pass_use_value !== void 0 ? { wallet_pass_use_value: item.wallet_pass_use_value } : {},
     ...item.fund_record && typeof item.fund_record === "object" && !Array.isArray(item.fund_record) ? { fund_record: { ...item.fund_record } } : {},

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

@@ -33,6 +33,13 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private runVoucherUpdateLocked;
     private normalizeVoucherPaymentItems;
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+     *
+     * @example
+     * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 记录信息日志
      */

package/lib/modules/Payment/index.js

@@ -127,6 +127,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     console.log("[PaymentModule] 初始化完成");
     this.logInfo("PaymentModule initialized successfully");
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+   *
+   * @example
+   * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+   */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+  }
   /**
    * 记录信息日志
    */

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

@@ -10,6 +10,13 @@ export declare class ProductList extends BaseModule implements Module {
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
+    /**
+     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+     *
+     * @example
+     * productList.updateOtherParams({ channel: 'pos' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     storeChange(path?: string, value?: any): Promise<void>;
     loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
         category_ids?: number[];

package/lib/modules/ProductList/index.js

@@ -47,6 +47,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
     }
     this.request = core.getPlugin("request");
   }
+  /**
+   * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+   *
+   * @example
+   * productList.updateOtherParams({ channel: 'pos' });
+   */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+  }
   async storeChange(path, value) {
   }
   async loadProducts({

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

@@ -11,6 +11,13 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private surchargeListModuleName;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     */
+    updateOtherParams(params: Record<string, any>): Promise<void>;
     getSurchargeList(): Promise<void>;
     private getAppData;
     private getTaxConfig;

package/lib/modules/SalesSummary/index.js

@@ -57,6 +57,19 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
     await this.getSurchargeList();
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+   *
+   * @example
+   * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+   */
+  async updateOtherParams(params) {
+    const nextSurchargeListModuleName = (params == null ? void 0 : params.surchargeListModuleName) || "surchargeList";
+    if (nextSurchargeListModuleName === this.surchargeListModuleName)
+      return;
+    this.surchargeListModuleName = nextSurchargeListModuleName;
+    await this.getSurchargeList();
+  }
   async getSurchargeList() {
     try {
       const surchargeListModule = this.core.getModule(
@@ -100,12 +113,13 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     };
   }
   async getSummary(params) {
+    var _a, _b;
     const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
     const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`
     );
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (_b = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids)) == null ? void 0 : _b.flat();
     const scheduleList = summarySchedule == null ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

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

@@ -11,6 +11,13 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     /**
      * 加载当前店铺下所有 schedule
      *

package/lib/modules/Schedule/index.js

@@ -73,6 +73,18 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+   *
+   * @example
+   * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+   */
+  updateOtherParams(params) {
+    const otherParams = params || {};
+    this.openCache = otherParams.openCache ?? false;
+    this.cacheId = otherParams.cacheId;
+    this.fatherModule = otherParams.fatherModule;
+  }
   /**
    * 加载当前店铺下所有 schedule
    *

package/lib/modules/Summary/index.js

@@ -119,8 +119,9 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     });
   }
   getSurchargeforUtils(items) {
+    var _a;
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

package/lib/server/modules/order/types.d.ts

@@ -241,6 +241,8 @@ export interface OrderPaymentItem {
     status?: OrderPaymentRecordStatus;
     /** 支付时间（输入/输出均保留）。来源：OrderPayment.payment_time */
     payment_time?: string | null;
+    /** 支付创建时间（输入/输出均保留）。来源：OrderPayment.created_at */
+    created_at?: string | null;
     /** 手续费配置。来源：OrderPayment.service_charge */
     service_charge?: Record<string, unknown> | null;
     /** Wallet Pass 使用单位 */

package/lib/server/modules/order/utils/filterBookings.js

@@ -71,6 +71,21 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return `${d} ${t}`.trim();
 }
+function resolveBookingTimeRange(booking) {
+  const start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start)
+    return null;
+  const end = toTimestamp(
+    bookingDateTimeString(
+      booking.end_date || booking.start_date,
+      booking.end_time || booking.start_time
+    )
+  ) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+function isRangeOverlapping(left, right) {
+  return left[0] <= right[1] && left[1] >= right[0];
+}
 function parseDateRange(range) {
   if (!Array.isArray(range) || range.length < 2)
     return null;
@@ -182,8 +197,8 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
+    const bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange))
       return false;
   }
   if (ctx.afterExecutionTimeMs != null) {