@pisell/pisellos 2.2.153 → 2.2.154

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

@@ -82,6 +82,9 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getResourceId;
     private getBookingAppointmentStatus;
     private getBookingOrderPaymentStatus;
+    private countBookingOrders;
+    private countCompletedBookings;
+    private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
     /**

package/dist/solution/Sales/index.js

@@ -409,6 +409,43 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
+  }, {
+    key: "countBookingOrders",
+    value: function countBookingOrders(bookings) {
+      var orderIds = new Set();
+      bookings.forEach(function (booking) {
+        var _order_id, _booking$order2;
+        var orderId = (_order_id = booking.order_id) !== null && _order_id !== void 0 ? _order_id : (_booking$order2 = booking.order) === null || _booking$order2 === void 0 ? void 0 : _booking$order2.order_id;
+        if (orderId === undefined || orderId === null) return;
+        orderIds.add(String(orderId));
+      });
+      return orderIds.size;
+    }
+  }, {
+    key: "countCompletedBookings",
+    value: function countCompletedBookings(bookings) {
+      var _this2 = this;
+      return bookings.filter(function (booking) {
+        return _this2.getBookingAppointmentStatus(booking) === 'completed';
+      }).length;
+    }
+  }, {
+    key: "groupBookingsByResource",
+    value: function groupBookingsByResource(bookingList) {
+      var bookingMap = new Map();
+      bookingList.forEach(function (booking) {
+        if (!Array.isArray(booking.resources)) return;
+        booking.resources.forEach(function (resource) {
+          var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
+          if (relationId === undefined || relationId === null) return;
+          var key = String(relationId);
+          var list = bookingMap.get(key) || [];
+          list.push(booking);
+          bookingMap.set(key, list);
+        });
+      });
+      return bookingMap;
+    }
   }, {
     key: "isBookingMatchedResource",
     value: function isBookingMatchedResource(booking, resourceId) {
@@ -422,10 +459,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sortMatchedBookings",
     value: function sortMatchedBookings(bookings) {
-      var _this2 = this;
+      var _this3 = this;
       return _toConsumableArray(bookings).sort(function (left, right) {
-        var leftStartAt = _this2.toBookingDateTime(left.start_date, left.start_time).valueOf();
-        var rightStartAt = _this2.toBookingDateTime(right.start_date, right.start_time).valueOf();
+        var leftStartAt = _this3.toBookingDateTime(left.start_date, left.start_time).valueOf();
+        var rightStartAt = _this3.toBookingDateTime(right.start_date, right.start_time).valueOf();
         return leftStartAt - rightStartAt;
       });
     }
@@ -440,17 +477,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
-      var _this3 = this;
+      var _this4 = this;
       if (bookings.length === 0) return [];
       var currentDayStart = current.startOf('day');
       var currentDayEnd = current.endOf('day');
 
       // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
       var dayScopedBookings = bookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrBefore(startAt, currentDayEnd) && _this3.isSameOrAfter(endAt, currentDayStart);
+        return _this4.isSameOrBefore(startAt, currentDayEnd) && _this4.isSameOrAfter(endAt, currentDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -460,21 +497,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
         if (!shouldAppendNextGroup) return selectedBookings;
         var selectedStartValues = new Set(selectedBookings.map(function (booking) {
-          return _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          return _this4.toBookingDateTime(booking.start_date, booking.start_time);
         }).filter(function (startAt) {
           return startAt.isValid();
         }).map(function (startAt) {
           return startAt.valueOf();
         }));
         var futureCandidates = dayScopedBookings.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           if (!startAt.isValid()) return false;
           return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
         });
         if (futureCandidates.length === 0) return selectedBookings;
-        var nextStartAt = _this3.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
+        var nextStartAt = _this4.toBookingDateTime(futureCandidates[0].start_date, futureCandidates[0].start_time).valueOf();
         var nextStartGroup = futureCandidates.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
@@ -486,10 +523,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // active: current 处于 [startAt, endAt] 区间
       var activeBookings = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
-        var endAt = _this3.toBookingDateTime(booking.end_date, booking.end_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+        var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this3.isSameOrAfter(current, startAt) && _this3.isSameOrBefore(current, endAt);
+        return _this4.isSameOrAfter(current, startAt) && _this4.isSameOrBefore(current, endAt);
       });
       if (activeBookings.length > 0) return appendNextStartGroupIfNeeded(activeBookings);
 
@@ -501,13 +538,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
 
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
-        var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+        var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
       });
       if (upcoming.length > 0) {
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
-          var startAt = _this3.toBookingDateTime(booking.start_date, booking.start_time);
+          var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
           return startAt.valueOf() === firstStartAt;
         });
         return appendNextStartGroupIfNeeded(upcomingStartGroup);
@@ -560,10 +597,10 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeResourceBookings",
     value: function normalizeResourceBookings(current, deviceCurrent, bookingList) {
-      var _this4 = this;
+      var _this5 = this;
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var normalizedBookings = bookingList.map(function (booking) {
-        return _this4.normalizeMatchedBooking(current, deviceCurrent, booking, options);
+        return _this5.normalizeMatchedBooking(current, deviceCurrent, booking, options);
       }).filter(function (booking) {
         return Boolean(booking);
       }).filter(function (booking) {
@@ -693,7 +730,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(currentTime) {
         var _resourceResponse$dat,
           _resourceResponse$dat2,
-          _this5 = this;
+          _this6 = this;
         var bookingList,
           deviceTime,
           current,
@@ -701,6 +738,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           resourceResponse,
           resourceList,
           normalizedBookings,
+          rawBookingMap,
           bookingMap,
           list,
           _args5 = arguments;
@@ -745,26 +783,21 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 14:
               // 全局先做 booking 标准化 + start_time 升序，后续映射直接复用
               normalizedBookings = this.normalizeResourceBookings(current, deviceCurrent, bookingList); // 建立 resourceId -> bookings[] 倒排索引，加速资源匹配
-              bookingMap = new Map();
-              normalizedBookings.forEach(function (booking) {
-                if (!Array.isArray(booking.resources)) return;
-                booking.resources.forEach(function (resource) {
-                  var relationId = resource === null || resource === void 0 ? void 0 : resource.relation_id;
-                  if (relationId === undefined || relationId === null) return;
-                  var key = String(relationId);
-                  var list = bookingMap.get(key) || [];
-                  list.push(booking);
-                  bookingMap.set(key, list);
-                });
-              });
-
-              // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
+              rawBookingMap = this.groupBookingsByResource(bookingList);
+              bookingMap = this.groupBookingsByResource(normalizedBookings); // 输出：每个资源都返回；bookings 可能是 0 / 1 / 多条（并发场景）
               list = resourceList.map(function (resource) {
-                var resourceId = _this5.getResourceId(resource);
+                var resourceId = _this6.getResourceId(resource);
+                var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
-                var bookings = _this5.pickBookingsForCurrentPoint(current, matchedBookings);
+                var orderCount = _this6.countBookingOrders(rawMatchedBookings);
+                var bookingCount = rawMatchedBookings.length;
+                var compeleteBookingCount = _this6.countCompletedBookings(rawMatchedBookings);
+                var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount,
                   bookings: bookings
                 });
               });
@@ -796,9 +829,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _getResourceBookingItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _resourceResponse$dat3,
           _resourceResponse$dat4,
-          _this6 = this,
+          _this7 = this,
           _params$bookingList;
-        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings;
+        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -836,7 +869,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", null);
             case 12:
               targetResource = resourceList.find(function (resource) {
-                return String(_this6.getResourceId(resource)) === String(params.resourceId);
+                return String(_this7.getResourceId(resource)) === String(params.resourceId);
               });
               if (targetResource) {
                 _context6.next = 15;
@@ -846,19 +879,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 15:
               resourceId = this.getResourceId(targetResource);
               matchedBookingList = params.bookingList.filter(function (booking) {
-                return _this6.isBookingMatchedResource(booking, resourceId);
+                return _this7.isBookingMatchedResource(booking, resourceId);
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingAppointmentStatus(booking) === 'completed';
+                return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this6.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this6.getBookingOrderPaymentStatus(booking) === 'payment_processing';
+                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
                 includeCompleted: true
               }));
               unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
+              orderCount = this.countBookingOrders(matchedBookingList);
+              bookingCount = matchedBookingList.length;
+              compeleteBookingCount = completedBookingList.length;
               this.logger.addLog({
                 type: 'info',
                 title: 'getResourceBookingItem',
@@ -869,16 +905,22 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   bookingList: (_params$bookingList = params.bookingList) === null || _params$bookingList === void 0 ? void 0 : _params$bookingList.length,
                   bookings: bookings.length,
                   completedBookings: completedBookings.length,
-                  unpaidBookings: unpaidBookings.length
+                  unpaidBookings: unpaidBookings.length,
+                  orderCount: orderCount,
+                  bookingCount: bookingCount,
+                  compeleteBookingCount: compeleteBookingCount
                 }
               });
               return _context6.abrupt("return", _objectSpread(_objectSpread({}, targetResource), {}, {
                 resource_id: resourceId,
+                orderCount: orderCount,
+                bookingCount: bookingCount,
+                compeleteBookingCount: compeleteBookingCount,
                 bookings: bookings,
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 24:
+            case 27:
             case "end":
               return _context6.stop();
           }

package/dist/solution/Sales/types.d.ts

@@ -30,6 +30,9 @@ export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'>
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
+    orderCount: number;
+    bookingCount: number;
+    compeleteBookingCount: number;
     bookings: SalesResourceMatchedBooking[];
 }
 export interface SalesResourceBookingItemWithGroups extends SalesResourceBookingItem {

package/dist/solution/ScanOrder/types.d.ts

@@ -85,13 +85,13 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 export interface ScanOrderSubmitProduct extends Omit<ScanOrderOrderProduct, '_origin' | 'identity_key'> {
     /**

package/dist/solution/ScanOrder/types.js

@@ -14,13 +14,13 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ product_option_item_id, option_group_id, num, price, ... }`，
- *   出站由 `normalizeSubmitProduct` 重命名为 `{ option_group_item_id, option_group_id, num }`
+ * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
+ *   出站保留 `{ option_group_item_id, option_group_id, num }`
  *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
- * 运行时（UI 显示、加购合并、指纹、持久化）全部消费内部字段名 `product_option_item_id`，
- * 仅在 SDK 提交边界做一次出站映射，不影响 opaque identity 契约。
+ * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名
+ * `option_group_item_id`，保持 tempOrder 与后端协议一致。
  */
 
 /**

package/dist/solution/ScanOrder/utils.js

@@ -381,14 +381,14 @@ export function buildProductLineFingerprint(productOptionItem, productBundle) {
   var normalizedOpts = optArr.map(function (item) {
     var _item$price;
     return {
-      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_item_id) || 0,
+      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
       option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
       num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
       price: String((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
     };
   }).sort(function (p, q) {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
     if (p.num !== q.num) return p.num - q.num;

package/lib/core/index.js

@@ -50,6 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
+    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/modules/Cart/utils/cartProduct.js

@@ -289,7 +289,7 @@ var formatOptionsToOrigin = (options) => {
   return options.map((d) => {
     return {
       num: d.num,
-      option_group_item_id: d.product_option_item_id,
+      option_group_item_id: d.option_group_item_id,
       option_group_id: d.option_group_id
     };
   });

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

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
+    private orderHooks?;
     private otherParams?;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
@@ -143,6 +144,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 视为 wallet pass；其它支付项保持不变。
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private shouldMergeProductToOrder;
     addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
     private hasGoodPassDiscount;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<OrderProduct[]>;

package/lib/modules/Order/index.js

@@ -76,7 +76,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options) {
-    var _a;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -98,6 +98,7 @@ 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.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.restoreTempOrderFromStorage();
@@ -996,6 +997,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.payments;
   }
+  async shouldMergeProductToOrder(params) {
+    var _a;
+    const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
+    if (!onBeforeMergeProductToOrder)
+      return true;
+    const result = await onBeforeMergeProductToOrder({
+      ...params,
+      defaultShouldMerge: true
+    });
+    if (typeof result === "boolean")
+      return result;
+    if (result && typeof result === "object" && typeof result.shouldMerge === "boolean") {
+      return result.shouldMerge;
+    }
+    return true;
+  }
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product, booking) {
     var _a;
@@ -1018,13 +1035,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return false;
       if (item.product_variant_id !== productToAdd.product_variant_id)
         return false;
-      const existedFingerprint = (0, import_utils3.buildProductLineFingerprint)(
+      const existedFingerprint2 = (0, import_utils3.buildProductLineFingerprint)(
         item.product_option_item,
         item.product_bundle
       );
-      return existedFingerprint === incomingFingerprint;
+      return existedFingerprint2 === incomingFingerprint;
     });
-    if (matchedIndex === -1) {
+    const matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
+    const existedFingerprint = matchedProduct ? (0, import_utils3.buildProductLineFingerprint)(
+      matchedProduct.product_option_item,
+      matchedProduct.product_bundle
+    ) : "";
+    const shouldMerge = matchedProduct ? await this.shouldMergeProductToOrder({
+      incomingProduct: productToAdd,
+      normalizedIncoming,
+      matchedProduct,
+      matchedIndex,
+      incomingFingerprint,
+      existedFingerprint,
+      tempOrder,
+      booking
+    }) : false;
+    if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
       this.captureProductRuntime(
         tempOrder,
         productToAdd,
@@ -1039,7 +1071,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
       tempOrder.products.push(normalizedIncoming);
     } else {
-      const targetProduct = tempOrder.products[matchedIndex];
+      const targetProduct = matchedProduct;
       const targetUid = (_a = targetProduct.metadata) == null ? void 0 : _a.unique_identification_number;
       const normalizedProduct = (0, import_utils3.normalizeOrderProduct)({
         ...productToAdd,
@@ -1592,7 +1624,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // TODO 获取详情的接口
   async getOrderInfoByRemote(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
-      with: ["products", "scheduleEvents", "payments", "customer", "summary", "contacts_info"]
+      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"]
     });
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
@@ -1716,7 +1748,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
-      with: ["products", "scheduleEvents"]
+      with: ["products", "bookings"]
     });
     return res;
   }

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

@@ -186,6 +186,25 @@ export interface UpdateProductInOrderParams {
     product_bundle?: any[];
 }
 export type AddProductBookingInput = Record<string, any>;
+export interface OrderProductMergeDecisionContext {
+    incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
+    normalizedIncoming: OrderProduct;
+    matchedProduct: OrderProduct;
+    matchedIndex: number;
+    incomingFingerprint: string;
+    existedFingerprint: string;
+    tempOrder: OrderTempOrder;
+    booking?: AddProductBookingInput;
+    defaultShouldMerge: boolean;
+}
+export type OrderProductMergeDecisionResult = boolean | {
+    shouldMerge: boolean;
+    reason?: string;
+    [key: string]: any;
+};
+export interface OrderHooksConfig {
+    onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
+}
 /**
  * 订单信息
  */

package/lib/modules/Order/utils.js

@@ -250,7 +250,7 @@ function formatSubmitOptionItems(options) {
   return options.map((d) => {
     const option = {
       num: d == null ? void 0 : d.num,
-      option_group_item_id: (d == null ? void 0 : d.option_group_item_id) ?? (d == null ? void 0 : d.product_option_item_id),
+      option_group_item_id: d == null ? void 0 : d.option_group_item_id,
       option_group_id: d == null ? void 0 : d.option_group_id
     };
     const addPrice = (d == null ? void 0 : d.add_price) ?? (d == null ? void 0 : d.price);
@@ -525,7 +525,9 @@ function buildSubmitPayload(params) {
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
     created_at: tempOrder.created_at || formatDateTime(now),
-    bookings: (tempOrder.bookings || []).map((booking) => normalizeSubmitBooking(booking)),
+    bookings: (tempOrder.bookings || []).filter(
+      (booking) => Number(booking.parent_id ?? 0) !== 0
+    ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],

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

@@ -25,6 +25,9 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
+    private payMethodMemoryCache;
+    private payMethodListInFlight;
+    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -59,6 +62,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
+    private loadPayMethodListAsync;
     /**
      * 后台刷新支付方式列表
      */

package/lib/modules/Payment/index.js

@@ -76,6 +76,9 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
     this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
+    this.payMethodMemoryCache = null;
+    this.payMethodListInFlight = null;
+    this.isRefreshingPaymentMethods = false;
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
@@ -228,7 +231,20 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 获取支付方式列表
    */
   async getPayMethodListAsync() {
+    var _a;
     this.logInfo("Starting getPayMethodListAsync");
+    if ((_a = this.payMethodMemoryCache) == null ? void 0 : _a.length) {
+      return this.payMethodMemoryCache;
+    }
+    if (this.payMethodListInFlight) {
+      return this.payMethodListInFlight;
+    }
+    this.payMethodListInFlight = this.loadPayMethodListAsync().finally(() => {
+      this.payMethodListInFlight = null;
+    });
+    return this.payMethodListInFlight;
+  }
+  async loadPayMethodListAsync() {
     try {
       let cachedMethods = [];
       try {
@@ -238,12 +254,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
       const hasCache = cachedMethods.length > 0;
       if (hasCache) {
+        this.payMethodMemoryCache = cachedMethods;
         this.refreshPaymentMethodsInBackground(cachedMethods);
         return cachedMethods;
       }
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = this.filterPayMethods(response.data);
+      response.data = await this.filterPayMethods(response.data);
       const payMethods = response.data || [];
+      this.payMethodMemoryCache = payMethods;
       try {
         for (const method of payMethods) {
           await this.dbManager.update("pay_method", method);
@@ -269,14 +287,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 后台刷新支付方式列表
    */
   async refreshPaymentMethodsInBackground(cachedMethods) {
+    if (this.isRefreshingPaymentMethods)
+      return;
+    this.isRefreshingPaymentMethods = true;
     this.logInfo("Starting refreshPaymentMethodsInBackground", {
       cachedMethodsCount: cachedMethods.length
     });
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
       const response = await this.request.get("/pay/custom-payment/all");
-      response.data = this.filterPayMethods(response.data);
+      response.data = await this.filterPayMethods(response.data);
       const newPayMethods = response.data || [];
+      this.payMethodMemoryCache = newPayMethods;
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,
         newPayMethods
@@ -310,6 +332,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       }
     } catch (error) {
       console.error("[PaymentModule] 后台刷新支付方式失败", error);
+    } finally {
+      this.isRefreshingPaymentMethods = false;
     }
   }
   /**