@pisell/pisellos 2.2.222 → 2.2.224

package/dist/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/dist/modules/Order/utils.js

@@ -677,7 +677,7 @@ function normalizeSubmitProduct(product) {
     payment_price: (_submitProduct$paymen = submitProduct.payment_price) !== null && _submitProduct$paymen !== void 0 ? _submitProduct$paymen : submitProduct.selling_price
   });
 }
-var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type'];
+var SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
 export function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }
@@ -896,7 +896,7 @@ export function buildSubmitPayload(params) {
   });
 }
 export function mapPaymentItemToOrderPayment(paymentItem) {
-  var _item$custom_payment_, _item$payment_time, _item$amount;
+  var _item$custom_payment_, _item$payment_time, _item$created_at, _item$amount;
   var item = paymentItem;
   var customPaymentId = (_item$custom_payment_ = item.custom_payment_id) !== null && _item$custom_payment_ !== void 0 ? _item$custom_payment_ : item.id;
   var metadata = item.metadata && _typeof(item.metadata) === 'object' ? _objectSpread({}, item.metadata) : {};
@@ -910,7 +910,9 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
       metadata[key] = item[key];
     }
   }
-  var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : dayjs().format('YYYY-MM-DD HH:mm:ss');
+  var timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : timestamp;
+  var createdAt = (_item$created_at = item.created_at) !== null && _item$created_at !== void 0 ? _item$created_at : timestamp;
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
     order_payment_id: item.order_payment_id
   } : {}), {}, {
@@ -928,7 +930,8 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   } : {}), item.status !== undefined ? {
     status: item.status
   } : {}), {}, {
-    payment_time: paymentTime
+    payment_time: paymentTime,
+    created_at: createdAt
   }, item.wallet_pass_usage_unit !== undefined ? {
     wallet_pass_usage_unit: item.wallet_pass_usage_unit
   } : {}), item.wallet_pass_use_value !== undefined ? {

package/dist/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/dist/modules/Payment/index.js

@@ -217,6 +217,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，主要用于日志父模块等上下文。
+     *
+     * @example
+     * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      this.otherParams = params || {};
+    }
+
     /**
      * 记录信息日志
      */

package/dist/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/dist/modules/ProductList/index.js

@@ -64,6 +64,17 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+     *
+     * @example
+     * productList.updateOtherParams({ channel: 'pos' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      this.otherParams = params || {};
+    }
   }, {
     key: "storeChange",
     value: function () {

package/dist/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/dist/modules/SalesSummary/index.js

@@ -85,27 +85,62 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: (function () {
+      var _updateOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var nextSurchargeListModuleName;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              nextSurchargeListModuleName = (params === null || params === void 0 ? void 0 : params.surchargeListModuleName) || 'surchargeList';
+              if (!(nextSurchargeListModuleName === this.surchargeListModuleName)) {
+                _context2.next = 3;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 3:
+              this.surchargeListModuleName = nextSurchargeListModuleName;
+              _context2.next = 6;
+              return this.getSurchargeList();
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function updateOtherParams(_x3) {
+        return _updateOtherParams.apply(this, arguments);
+      }
+      return updateOtherParams;
+    }())
   }, {
     key: "getSurchargeList",
     value: function () {
-      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var surchargeListModule, surchargeList;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.prev = 0;
+              _context3.prev = 0;
               surchargeListModule = this.core.getModule(this.surchargeListModuleName);
               if (!(surchargeListModule !== null && surchargeListModule !== void 0 && surchargeListModule.getSurchargeList)) {
-                _context2.next = 7;
+                _context3.next = 7;
                 break;
               }
-              _context2.next = 5;
+              _context3.next = 5;
               return surchargeListModule.getSurchargeList();
             case 5:
-              this.store.surchargeList = _context2.sent;
-              return _context2.abrupt("return");
+              this.store.surchargeList = _context3.sent;
+              return _context3.abrupt("return");
             case 7:
-              _context2.next = 9;
+              _context3.next = 9;
               return this.request.get('/order/custom-surcharge/available/v2', {
                 // TODO 真实的渠道
                 channel: 'online-store',
@@ -114,20 +149,20 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
                 with: ['relationSchedule']
               });
             case 9:
-              surchargeList = _context2.sent;
+              surchargeList = _context3.sent;
               this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              _context2.next = 17;
+              _context3.next = 17;
               break;
             case 13:
-              _context2.prev = 13;
-              _context2.t0 = _context2["catch"](0);
-              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context2.t0);
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](0);
+              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context3.t0);
               this.store.surchargeList = [];
             case 17:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[0, 13]]);
+        }, _callee3, this, [[0, 13]]);
       }));
       function getSurchargeList() {
         return _getSurchargeList.apply(this, arguments);
@@ -157,18 +192,18 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _ref;
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var _this$store$surcharge, _ref;
         var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount;
               taxConfig = this.getTaxConfig();
               summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
-              needScheduleIds = this.store.surchargeList.map(function (item) {
+              needScheduleIds = (_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
-              }).flat();
+              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat();
               scheduleList = summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
               scheduleById = {};
               if (Array.isArray(scheduleList)) {
@@ -198,14 +233,14 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
                 tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate
               });
               this.store.summary = summaryWithTaxMeta;
-              return _context3.abrupt("return", summaryWithTaxMeta);
+              return _context4.abrupt("return", summaryWithTaxMeta);
             case 11:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function getSummary(_x3) {
+      function getSummary(_x4) {
         return _getSummary.apply(this, arguments);
       }
       return getSummary;

package/dist/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/dist/modules/Schedule/index.js

@@ -93,6 +93,22 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并刷新 schedule 缓存写入配置。
+     *
+     * @example
+     * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
+     */
+  }, {
+    key: "updateOtherParams",
+    value: function updateOtherParams(params) {
+      var _otherParams$openCach;
+      var otherParams = params || {};
+      this.openCache = (_otherParams$openCach = otherParams.openCache) !== null && _otherParams$openCach !== void 0 ? _otherParams$openCach : false;
+      this.cacheId = otherParams.cacheId;
+      this.fatherModule = otherParams.fatherModule;
+    }
+
     /**
      * 加载当前店铺下所有 schedule
      *

package/dist/modules/Summary/index.js

@@ -208,9 +208,10 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSurchargeforUtils",
     value: function getSurchargeforUtils(items) {
+      var _this$store$surcharge2;
       // const surchargeList = this.store.surchargeList;
       var scheduleModule = this.core.getModule('appointmentBooking_schedule');
-      var needScheduleIds = this.store.surchargeList.map(function (item) {
+      var needScheduleIds = (_this$store$surcharge2 = this.store.surchargeList) === null || _this$store$surcharge2 === void 0 ? void 0 : _this$store$surcharge2.map(function (item) {
         return item.available_schedule_ids;
       }).flat();
       var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);

package/dist/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/dist/server/modules/order/utils/filterBookings.js

@@ -54,6 +54,29 @@ function bookingDateTimeString(datePart, timePart) {
   }
   return "".concat(d, " ").concat(t).trim();
 }
+
+/**
+ * 解析预约自身的起止时间区间，供 `sales_time_between` 做区间重叠匹配。
+ *
+ * @example
+ * const span = resolveBookingTimeRange({ start_date: '2026-06-09', start_time: '10:00', end_date: '2026-06-15', end_time: '10:00' })
+ */
+function resolveBookingTimeRange(booking) {
+  var start = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
+  if (!start) return null;
+  var end = toTimestamp(bookingDateTimeString(booking.end_date || booking.start_date, booking.end_time || booking.start_time)) || start;
+  return end >= start ? [start, end] : [end, start];
+}
+
+/**
+ * 判断两个闭区间是否有交集。
+ *
+ * @example
+ * isRangeOverlapping([1, 10], [5, 6]) // true
+ */
+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;
   var start = toRangeBoundary(range[0], false);
@@ -160,8 +183,8 @@ function matchBooking(booking, orderInfo, ctx) {
   }
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
   if (ctx.bookingTimeRange) {
-    var ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
-    if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1]) return false;
+    var bookingRange = resolveBookingTimeRange(booking);
+    if (!bookingRange || !isRangeOverlapping(bookingRange, ctx.bookingTimeRange)) return false;
   }
   if (ctx.afterExecutionTimeMs != null) {
     var bookingStartMs = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));