@pisell/pisellos 2.2.249 → 2.2.251

package/dist/server/index.js

@@ -49,6 +49,8 @@ import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 
 /** 非当天（远端）预约查询订阅者 */
 
+/** Server 运行时诊断快照，用于排查订阅者是否持续增长。 */
+
 /** 平面图 GET 查询订阅者（列表 / id 详情 / code 详情） */
 
 var PRODUCT_TITLE_SNAPSHOT_KEYS = ['en', 'ja', 'pt', 'auto', 'zh-CN', 'zh-HK', 'kitchen', 'original'];
@@ -1236,7 +1238,7 @@ var Server = /*#__PURE__*/function () {
               url = _ref44.url, data = _ref44.data, config = _ref44.config, routePath = _ref44.path;
               base = '/shop/schedule/floor-plan';
               path = _this.parseRequestPath(url, routePath);
-              if (!(path === "".concat(base, "/unsubscribe"))) {
+              if (!(path === "".concat(base, "/unsubscribe") || path === "".concat(base, "/code/unsubscribe"))) {
                 _context18.next = 7;
                 break;
               }
@@ -1477,10 +1479,34 @@ var Server = /*#__PURE__*/function () {
   }
 
   /**
-   * 注册路由
-   * @param routes 路由定义数组
+   * 获取 Server 内部订阅者和缓存数量快照。
+   *
+   * @example
+   * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
    */
   _createClass(Server, [{
+    key: "getDiagnosticsSnapshot",
+    value: function getDiagnosticsSnapshot() {
+      return {
+        subscribers: {
+          productQuerySubscribers: this.productQuerySubscribers.size,
+          orderQuerySubscribers: this.orderQuerySubscribers.size,
+          bookingQuerySubscribers: this.bookingQuerySubscribers.size,
+          bookingRemoteQuerySubscribers: this.bookingRemoteQuerySubscribers.size,
+          salesSearchSubscribers: this.salesSearchSubscribers.size,
+          floorPlanQuerySubscribers: this.floorPlanQuerySubscribers.size
+        },
+        caches: {
+          bookingRemoteCache: this.bookingRemoteCache.size
+        }
+      };
+    }
+
+    /**
+     * 注册路由
+     * @param routes 路由定义数组
+     */
+  }, {
     key: "registerRoutes",
     value: function registerRoutes(routes) {
       var _this2 = this;
@@ -6392,6 +6418,9 @@ var Server = /*#__PURE__*/function () {
       if (changedOrders.length === 0) {
         return;
       }
+      // 如果当前开启了 checkout 弹窗，先不进行刷新，下面的代码会导致在全局搜索页调用 bookingTicket.destroy()
+      // 导致模块被销毁 ，checkout 弹窗永远无法关闭
+      if (window.isPaymentModalPluginOpen) return;
       var _iterator20 = _createForOfIteratorHelper(this.salesSearchSubscribers.entries()),
         _step20;
       try {

package/dist/server/modules/order/index.d.ts

@@ -193,7 +193,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
-    private getProductMergeKey;
+    private getProductIdentityKeys;
     private mergeOrderProductLists;
     private getPaymentMergeKey;
     private mergeOrderPaymentLists;

package/dist/server/modules/order/index.js

@@ -1899,20 +1899,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return left;
     }
   }, {
-    key: "getProductMergeKey",
-    value: function getProductMergeKey(product) {
+    key: "getProductIdentityKeys",
+    value: function getProductIdentityKeys(product) {
       var _record$metadata;
       var record = product;
-      if (!record) return '';
+      if (!record) return [];
+      var keys = [];
       var metadataUid = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.unique_identification_number;
-      if (!this.isBlankIdentityValue(metadataUid)) return "uid:".concat(String(metadataUid));
+      if (!this.isBlankIdentityValue(metadataUid)) keys.push("uid:".concat(String(metadataUid)));
       var topLevelUid = record.unique_identification_number;
-      if (!this.isBlankIdentityValue(topLevelUid)) return "uid:".concat(String(topLevelUid));
+      if (!this.isBlankIdentityValue(topLevelUid)) keys.push("uid:".concat(String(topLevelUid)));
       var orderDetailId = record.order_detail_id;
-      if (!this.isBlankIdentityValue(orderDetailId)) return "detail:".concat(String(orderDetailId));
+      if (!this.isBlankIdentityValue(orderDetailId)) keys.push("detail:".concat(String(orderDetailId)));
       var bookingUid = record.booking_uid;
-      if (!this.isBlankIdentityValue(bookingUid)) return "booking:".concat(String(bookingUid));
-      return '';
+      if (!this.isBlankIdentityValue(bookingUid)) keys.push("booking:".concat(String(bookingUid)));
+      return keys;
     }
   }, {
     key: "mergeOrderProductLists",
@@ -1927,8 +1928,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
           var item = _step13.value;
-          var key = this.getProductMergeKey(item);
-          if (key) seenKeys.add(key);
+          var keys = this.getProductIdentityKeys(item);
+          var _iterator15 = _createForOfIteratorHelper(keys),
+            _step15;
+          try {
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var key = _step15.value;
+              seenKeys.add(key);
+            }
+          } catch (err) {
+            _iterator15.e(err);
+          } finally {
+            _iterator15.f();
+          }
         }
       } catch (err) {
         _iterator13.e(err);
@@ -1941,9 +1953,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
           var _item = _step14.value;
-          var _key = this.getProductMergeKey(_item);
-          if (!_key || seenKeys.has(_key)) continue;
-          seenKeys.add(_key);
+          var _keys = this.getProductIdentityKeys(_item);
+          if (_keys.length === 0 || _keys.some(function (key) {
+            return seenKeys.has(key);
+          })) continue;
+          var _iterator16 = _createForOfIteratorHelper(_keys),
+            _step16;
+          try {
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _key = _step16.value;
+              seenKeys.add(_key);
+            }
+          } catch (err) {
+            _iterator16.e(err);
+          } finally {
+            _iterator16.f();
+          }
           result.push(cloneDeep(_item));
         }
       } catch (err) {
@@ -1981,19 +2006,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (incomingList.length === 0) return cloneDeep(existingList);
       if (existingList.length === 0) return cloneDeep(incomingList);
       var existingByKey = new Map();
-      var _iterator15 = _createForOfIteratorHelper(existingList),
-        _step15;
+      var _iterator17 = _createForOfIteratorHelper(existingList),
+        _step17;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var payment = _step15.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var payment = _step17.value;
           var key = this.getPaymentMergeKey(payment);
           if (!key) continue;
           existingByKey.set(key, payment);
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator15.f();
+        _iterator17.f();
       }
       return incomingList.map(function (payment) {
         var incomingPayment = payment;
@@ -2012,7 +2037,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
@@ -2054,30 +2079,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator16 = _createForOfIteratorHelper(orders),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(orders),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var order = _step16.value;
-          var _iterator17 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step17;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
+          var _iterator19 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step19;
           try {
-            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-              var key = _step17.value;
+            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+              var key = _step19.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator17.e(err);
+            _iterator19.e(err);
           } finally {
-            _iterator17.f();
+            _iterator19.f();
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
@@ -2119,11 +2144,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator18 = _createForOfIteratorHelper(orders),
-        _step18;
+      var _iterator20 = _createForOfIteratorHelper(orders),
+        _step20;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var order = _step18.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var order = _step20.value;
           var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
             list.push(order);
@@ -2133,9 +2158,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator18.f();
+        _iterator20.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2285,11 +2310,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var merged = remoteOrders.map(function (order) {
         return _this19.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator19 = _createForOfIteratorHelper(existingOrders),
-        _step19;
+      var _iterator21 = _createForOfIteratorHelper(existingOrders),
+        _step21;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var order = _step19.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var order = _step21.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2300,9 +2325,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator19.f();
+        _iterator21.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2396,7 +2421,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.prev = 12;
               _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator20, _step20, order;
+                var writeMethod, _iterator22, _step22, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
@@ -2433,15 +2458,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator20 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator22 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator20.s();
+                      _iterator22.s();
                     case 19:
-                      if ((_step20 = _iterator20.n()).done) {
+                      if ((_step22 = _iterator22.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step20.value;
+                      order = _step22.value;
                       _context19.next = 23;
                       return _this20.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -2453,10 +2478,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator20.e(_context19.t0);
+                      _iterator22.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator20.f();
+                      _iterator22.f();
                       return _context19.finish(30);
                     case 33:
                       _this20.recordRecentSqliteWrite(source, compactedToWrite);

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

@@ -458,7 +458,10 @@ export interface OrderFilters {
  * 预约展开列表筛选条件（订单级条件匹配 booking.order.*，预约级匹配 booking 自身）
  */
 export interface BookingFilters {
+    /** RecordBoard 通用搜索字段（单数），用于本地预约过滤 */
     keyword?: string;
+    /** `/shop/schedule/booking` 后端协议搜索字段（复数），OS Server 需兼容 */
+    keywords?: string;
     order_by?: string;
     order_payment_status?: string[];
     order_status?: string[];

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

@@ -97,9 +97,16 @@ function parseNumberRange(range) {
 // 供 matchOrder、matchBooking 复用，避免重复计算
 // ─────────────────────────────────────────────────────────────────
 
+/** 预约列表搜索兼容前端通用 `keyword` 与后端协议 `keywords` 两种字段 */
+function resolveBookingKeyword(f) {
+  var _f$keyword;
+  var keyword = (_f$keyword = f.keyword) !== null && _f$keyword !== void 0 ? _f$keyword : f.keywords;
+  return typeof keyword === 'string' ? keyword.trim() : '';
+}
 function prepareFilters(f) {
   var _f$order_payment_stat, _f$order_status, _f$order_sales_channe, _f$payment_method, _f$appointment_status, _f$form_record_ids;
   var hasCustomerId = f.customer_id !== undefined && f.customer_id !== null;
+  var keyword = resolveBookingKeyword(f);
   return {
     orderPaymentStatusSet: (_f$order_payment_stat = f.order_payment_status) !== null && _f$order_payment_stat !== void 0 && _f$order_payment_stat.length ? new Set(f.order_payment_status) : null,
     orderStatusSet: (_f$order_status = f.order_status) !== null && _f$order_status !== void 0 && _f$order_status.length ? new Set(f.order_status) : null,
@@ -116,7 +123,7 @@ function prepareFilters(f) {
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),
     totalAmountRange: Array.isArray(f.total_amount_between) && f.total_amount_between.length === 2 ? f.total_amount_between : null,
-    keywordLower: f.keyword ? f.keyword.toLowerCase() : '',
+    keywordLower: keyword ? keyword.toLowerCase() : '',
     afterExecutionTimeMs: function () {
       var raw = f.after_execution_time;
       if (raw === undefined || raw === null || raw === '') return null;

package/dist/server/utils/small-ticket.d.ts

@@ -35,7 +35,6 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
-    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/dist/server/utils/small-ticket.js

@@ -213,22 +213,14 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
-    var discountList = normalizeProductDiscounts({
-      product: product,
-      locale: locale,
-      currencySymbol: currencySymbol,
-      quantity: quantity
-    });
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    return _objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList
-    }, discountList.length ? {
-      discount_list: discountList
-    } : {}), options.length ? {
+    }, options.length ? {
       options: options
     } : {}), resolvedVariant ? {
       variant: resolvedVariant
@@ -249,12 +241,10 @@ function normalizeProductDiscounts(params) {
     var title = resolveDiscountTitleWithPercent(discount, locale);
     var amount = (_ref8 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref8 !== void 0 ? _ref8 : discount.discount_amount;
     var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
-    return _objectSpread(_objectSpread({}, discount), {}, {
+    return {
       item: title,
-      name: title,
-      title: title,
       value: formattedAmount
-    });
+    };
   });
 }
 function buildProductExtensionList(params) {
@@ -263,6 +253,12 @@ function buildProductExtensionList(params) {
     currencySymbol = params.currencySymbol,
     quantity = params.quantity,
     originalPrice = params.originalPrice;
+  var discountList = normalizeProductDiscounts({
+    product: product,
+    locale: locale,
+    currencySymbol: currencySymbol,
+    quantity: quantity
+  });
   var extensionList = [].concat(_toConsumableArray(buildProductOpenWeightRows({
     product: product,
     locale: locale,
@@ -275,7 +271,8 @@ function buildProductExtensionList(params) {
     }),
     value: ''
   }] : []));
-  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  var productExtensionList = extensionList.length ? extensionList : normalizeArray(product.extension_list);
+  return [].concat(_toConsumableArray(productExtensionList), _toConsumableArray(discountList));
 }
 function buildProductOpenWeightRows(params) {
   var _productSku$unit, _productSku$net_weigh, _productSku$unit_pric;

package/dist/solution/BaseSales/index.js

@@ -786,8 +786,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderIdOrParams) {
-        var _ref11, _params$orderId;
-        var params, externalSaleNumber, lookup, res, message, currentTempOrder, record, sales;
+        var _ref11, _ref12, _ref13, _ref14, _params$orderId;
+        var params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record, sales;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -801,43 +801,55 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-              lookup = (_ref11 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref11 !== void 0 ? _ref11 : params.orderNumber;
-              if (!(lookup === undefined || lookup === null || lookup === '')) {
-                _context7.next = 7;
+              preloadedSalesDetail = params.preloadedSalesDetail;
+              lookup = (_ref11 = (_ref12 = (_ref13 = (_ref14 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref14 !== void 0 ? _ref14 : params.orderNumber) !== null && _ref13 !== void 0 ? _ref13 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref12 !== void 0 ? _ref12 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref11 !== void 0 ? _ref11 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
+              if (!(!preloadedSalesDetail && (lookup === undefined || lookup === null || lookup === ''))) {
+                _context7.next = 8;
                 break;
               }
               throw new Error('加载销售详情需要 orderId、externalSaleNumber 或 orderNumber');
-            case 7:
-              _context7.next = 9;
+            case 8:
+              if (!(preloadedSalesDetail !== null && preloadedSalesDetail !== void 0)) {
+                _context7.next = 12;
+                break;
+              }
+              _context7.t0 = preloadedSalesDetail;
+              _context7.next = 15;
+              break;
+            case 12:
+              _context7.next = 14;
               return this.store.order.getSalesOrderByLookup({
                 lookup: lookup,
                 forceRemote: params.forceRemote
               });
-            case 9:
-              res = _context7.sent;
-              if (!(!res || res.code !== 200)) {
-                _context7.next = 13;
+            case 14:
+              _context7.t0 = _context7.sent;
+            case 15:
+              loadedRecord = _context7.t0;
+              if (!(!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200))) {
+                _context7.next = 19;
                 break;
               }
-              message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
+              message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
-            case 13:
+            case 19:
+              remoteRecord = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, res.data) : res.data;
-              _context7.next = 17;
+              record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+              _context7.next = 24;
               return this.store.order.hydrateTempOrderFromRecord(record, {
                 recalcOnHydrate: false
               });
-            case 17:
+            case 24:
               sales = _context7.sent;
               this.currentSalesDetail = sales;
-              _context7.next = 21;
+              _context7.next = 28;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 21:
+            case 28:
               return _context7.abrupt("return", sales);
-            case 22:
+            case 29:
             case "end":
               return _context7.stop();
           }
@@ -2149,7 +2161,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
-        var _ref12, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
+        var _ref15, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -2160,7 +2172,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref12 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref12 !== void 0 ? _ref12 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
+              businessCode = (_ref15 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref15 !== void 0 ? _ref15 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -2247,6 +2259,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
+        _ref16,
+        _paymentRecord$origin,
         _this7 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
@@ -2268,7 +2282,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
-      var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread({}, paymentRecord), {}, {
+      var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref16 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref16 !== void 0 ? _ref16 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
+        service_fee: calculatedServiceFee
+      } : {}), {}, {
         metadata: metadata,
         payment_time: paymentTime,
         created_at: createdAt
@@ -2376,7 +2394,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _params$order_wait_pa, _ref13, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref17, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2419,7 +2437,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref13 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref13 !== void 0 ? _ref13 : 1
+                is_price_include_tax: (_ref17 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref17 !== void 0 ? _ref17 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2550,7 +2568,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-        var orderIds, _ref14, _ref15, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref18, _ref19, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2571,7 +2589,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context26.sent;
-              orderId = (_ref14 = (_ref15 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref15 !== void 0 ? _ref15 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref14 !== void 0 ? _ref14 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref18 = (_ref19 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref19 !== void 0 ? _ref19 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref18 !== void 0 ? _ref18 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context26.next = 10;
                 break;
@@ -2997,14 +3015,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this$otherParams22;
-        var _ref16,
-          _ref16$cover,
+        var _ref20,
+          _ref20$cover,
           cover,
           _args36 = arguments;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              _ref16 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref16$cover = _ref16.cover, cover = _ref16$cover === void 0 ? false : _ref16$cover;
+              _ref20 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref20$cover = _ref20.cover, cover = _ref20$cover === void 0 ? false : _ref20$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -441,7 +441,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**