@pisell/pisellos 2.3.66 → 2.3.67

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

@@ -25,6 +25,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
+    private quotationBridgeUpdatedCallback?;
     private quotationScheduleCache;
     private quotationScheduleCacheSource;
     private quotationScheduleCacheLoaded;
@@ -72,6 +73,7 @@ export declare class ProductsModule extends BaseModule implements Module {
         scheduleModule?: any;
         channel?: string;
         customer_id?: number | string;
+        onQuotationUpdated?: () => void;
     }): Promise<void>;
     /**
      * 刷新桥接器内的报价单列表。
@@ -181,7 +183,9 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 通过 ProductDataSource SSE 加载完整商品列表
      */
-    loadProductsByServer(): Promise<any>;
+    loadProductsByServer(options?: {
+        trigger?: string;
+    }): Promise<any>;
     /**
      * 纯请求方法：通过 HTTP 接口获取商品列表（无副作用，不触发事件、不写 IndexDB）
      * @param params 查询参数
@@ -331,7 +335,9 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted
      * @returns 刷新后的商品列表
      */
-    silentRefresh(): Promise<ProductData[]>;
+    silentRefresh(options?: {
+        trigger?: string;
+    }): Promise<ProductData[]>;
     /**
      * 销毁同步资源（取消 pubsub 订阅、清除定时器）
      */

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

@@ -78,6 +78,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeLoadedKey", '');
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeRefreshPromise", void 0);
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeRefreshKey", void 0);
+    _defineProperty(_assertThisInitialized(_this), "quotationBridgeUpdatedCallback", void 0);
     _defineProperty(_assertThisInitialized(_this), "quotationScheduleCache", new Map());
     _defineProperty(_assertThisInitialized(_this), "quotationScheduleCacheSource", null);
     _defineProperty(_assertThisInitialized(_this), "quotationScheduleCacheLoaded", false);
@@ -290,7 +291,9 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _setupQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$otherParams,
-          _this3 = this;
+          _this3 = this,
+          _this$quotationPriceB,
+          _this$quotationPriceB2;
         var channel, quotation;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -351,11 +354,20 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                   return schedules[0];
                 });
               }
-              _context3.next = 13;
+              if (params.onQuotationUpdated) {
+                this.quotationBridgeUpdatedCallback = params.onQuotationUpdated;
+              }
+              (_this$quotationPriceB = (_this$quotationPriceB2 = this.quotationPriceBridge).setQuotationListUpdatedListener) === null || _this$quotationPriceB === void 0 || _this$quotationPriceB.call(_this$quotationPriceB2, function () {
+                var _this3$quotationBridg;
+                _this3.quotationBridgeLoadedKey = _this3.getQuotationBridgeScopeKey();
+                _this3.clearPriceCache();
+                (_this3$quotationBridg = _this3.quotationBridgeUpdatedCallback) === null || _this3$quotationBridg === void 0 || _this3$quotationBridg.call(_this3);
+              });
+              _context3.next = 15;
               return this.refreshQuotationPriceBridge({
                 customer_id: params.customer_id
               });
-            case 13:
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -1202,6 +1214,8 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "clearPriceCache",
     value: function clearPriceCache() {
       this.productsPriceCache.clear();
+      this.quotationScheduleCache.clear();
+      this.quotationScheduleCacheLoaded = false;
       console.log('[ProductsModule] 🗑️ 商品价格缓存已清空');
     }
 
@@ -1212,62 +1226,76 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductsByServer",
     value: (function () {
       var _loadProductsByServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var t0, tSSE, productList, list, duration, errorMessage;
+        var options,
+          trigger,
+          t0,
+          tSSE,
+          productList,
+          list,
+          duration,
+          errorMessage,
+          _args9 = arguments;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
+              options = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
               if (this.productDataSource) {
-                _context9.next = 3;
+                _context9.next = 4;
                 break;
               }
               this.logWarning('loadProductsByServer: ProductDataSource 不可用');
               return _context9.abrupt("return", []);
-            case 3:
-              this.logInfo('开始通过 DataSource SSE 加载商品列表');
+            case 4:
+              trigger = options.trigger || 'unknown';
+              this.logInfo('开始通过 DataSource SSE 加载商品列表', {
+                trigger: trigger
+              });
               t0 = performance.now();
-              _context9.prev = 5;
+              _context9.prev = 7;
               tSSE = performance.now();
-              _context9.next = 9;
+              _context9.next = 11;
               return this.productDataSource.run({
                 sse: {}
               });
-            case 9:
+            case 11:
               productList = _context9.sent;
               list = productList || [];
               perfMark('loadProductsByServer.SSE', performance.now() - tSSE, {
                 count: list.length
               });
               this.logInfo('通过 DataSource SSE 加载商品列表成功', {
+                trigger: trigger,
                 productCount: list.length,
                 duration: "".concat(Math.round(performance.now() - t0), "ms")
               });
-              _context9.next = 15;
+              _context9.next = 17;
               return this.replaceProductsSnapshotInIndexDB(list, 'loadProductsByServer');
-            case 15:
+            case 17:
               this.lastServerFullFetchAtMs = Date.now();
-              _context9.next = 18;
+              _context9.next = 20;
               return this.core.effects.emit(ProductsHooks.onProductsLoaded, list);
-            case 18:
+            case 20:
               perfMark('loadProductsByServer', performance.now() - t0, {
                 count: list.length
               });
               return _context9.abrupt("return", list);
-            case 22:
-              _context9.prev = 22;
-              _context9.t0 = _context9["catch"](5);
+            case 24:
+              _context9.prev = 24;
+              _context9.t0 = _context9["catch"](7);
               duration = Math.round(performance.now() - t0);
               errorMessage = _context9.t0 instanceof Error ? _context9.t0.message : String(_context9.t0);
               console.error('[Products] 加载商品数据失败:', _context9.t0);
               this.logError('通过 DataSource SSE 加载商品列表失败', {
+                trigger: trigger,
                 duration: "".concat(duration, "ms"),
                 error: errorMessage
               });
               return _context9.abrupt("return", []);
-            case 29:
+            case 31:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[5, 22]]);
+        }, _callee9, this, [[7, 24]]);
       }));
       function loadProductsByServer() {
         return _loadProductsByServer.apply(this, arguments);
@@ -1664,7 +1692,9 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               tTotal = performance.now();
               this.logInfo('refreshProducts 开始');
               _context16.next = 4;
-              return this.loadProductsByServer();
+              return this.loadProductsByServer({
+                trigger: 'product_sync'
+              });
             case 4:
               products = _context16.sent;
               if (products && products.length > 0) {
@@ -1756,7 +1786,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductsFromIndexDB",
     value: (function () {
       var _loadProductsFromIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _products$length, _products$length2, t0, products, errorMessage;
+        var startedAt, _products$length, _products$length2, products, durationMs, errorMessage;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1767,33 +1797,36 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.logWarning('loadProductsFromIndexDB: dbManager 不可用');
               return _context18.abrupt("return", []);
             case 3:
-              _context18.prev = 3;
-              t0 = performance.now();
+              startedAt = performance.now();
+              _context18.prev = 4;
               _context18.next = 7;
               return this.dbManager.getAll(INDEXDB_STORE_NAME);
             case 7:
               products = _context18.sent;
-              perfMark('loadProductsFromIndexDB', performance.now() - t0, {
+              durationMs = +(performance.now() - startedAt).toFixed(2);
+              perfMark('loadProductsFromIndexDB', durationMs, {
                 count: (_products$length = products === null || products === void 0 ? void 0 : products.length) !== null && _products$length !== void 0 ? _products$length : 0
               });
               this.logInfo('从 IndexDB 加载商品数据', {
-                productCount: (_products$length2 = products === null || products === void 0 ? void 0 : products.length) !== null && _products$length2 !== void 0 ? _products$length2 : 0
+                productCount: (_products$length2 = products === null || products === void 0 ? void 0 : products.length) !== null && _products$length2 !== void 0 ? _products$length2 : 0,
+                durationMs: durationMs
               });
               return _context18.abrupt("return", products || []);
-            case 13:
-              _context18.prev = 13;
-              _context18.t0 = _context18["catch"](3);
+            case 14:
+              _context18.prev = 14;
+              _context18.t0 = _context18["catch"](4);
               errorMessage = _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0);
               console.error('[Products] 从 IndexDB 读取数据失败:', _context18.t0);
               this.logError('从 IndexDB 读取数据失败', {
+                durationMs: +(performance.now() - startedAt).toFixed(2),
                 error: errorMessage
               });
               return _context18.abrupt("return", []);
-            case 19:
+            case 20:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[3, 13]]);
+        }, _callee18, this, [[4, 14]]);
       }));
       function loadProductsFromIndexDB() {
         return _loadProductsFromIndexDB.apply(this, arguments);
@@ -1847,7 +1880,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _replaceProductsSnapshotInIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(products, source) {
         var _this9 = this;
-        var errorMessage;
+        var enqueuedAt, queueWaitMs, clearDurationMs, writeDurationMs, errorMessage;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -1858,58 +1891,86 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.logWarning('replaceProductsSnapshotInIndexDB: dbManager 不可用');
               return _context21.abrupt("return");
             case 3:
-              _context21.prev = 3;
-              _context21.next = 6;
+              enqueuedAt = performance.now();
+              queueWaitMs = 0;
+              clearDurationMs = 0;
+              writeDurationMs = 0;
+              _context21.prev = 7;
+              _context21.next = 10;
               return this.runInProductIndexDBSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-                var t0;
+                var operationStartedAt, clearStartedAt, writeStartedAt, executeDurationMs;
                 return _regeneratorRuntime().wrap(function _callee20$(_context20) {
                   while (1) switch (_context20.prev = _context20.next) {
                     case 0:
+                      operationStartedAt = performance.now();
+                      queueWaitMs = +(operationStartedAt - enqueuedAt).toFixed(2);
                       _this9.logInfo('replaceProductsSnapshotInIndexDB 开始', {
                         source: source,
-                        productCount: products.length
+                        productCount: products.length,
+                        queueWaitMs: queueWaitMs
                       });
-                      t0 = performance.now();
-                      _context20.next = 4;
+                      clearStartedAt = performance.now();
+                      _context20.prev = 4;
+                      _context20.next = 7;
                       return _this9.dbManager.clear(INDEXDB_STORE_NAME);
-                    case 4:
+                    case 7:
+                      _context20.prev = 7;
+                      clearDurationMs = +(performance.now() - clearStartedAt).toFixed(2);
+                      return _context20.finish(7);
+                    case 10:
                       if (!(products.length > 0)) {
-                        _context20.next = 7;
+                        _context20.next = 18;
                         break;
                       }
-                      _context20.next = 7;
+                      writeStartedAt = performance.now();
+                      _context20.prev = 12;
+                      _context20.next = 15;
                       return _this9.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
-                    case 7:
-                      perfMark('replaceProductsSnapshotInIndexDB', performance.now() - t0, {
+                    case 15:
+                      _context20.prev = 15;
+                      writeDurationMs = +(performance.now() - writeStartedAt).toFixed(2);
+                      return _context20.finish(15);
+                    case 18:
+                      executeDurationMs = +(performance.now() - operationStartedAt).toFixed(2);
+                      perfMark('replaceProductsSnapshotInIndexDB', executeDurationMs, {
                         count: products.length
                       });
                       _this9.logInfo('replaceProductsSnapshotInIndexDB 完成', {
                         source: source,
-                        productCount: products.length
+                        productCount: products.length,
+                        queueWaitMs: queueWaitMs,
+                        clearDurationMs: clearDurationMs,
+                        writeDurationMs: writeDurationMs,
+                        executeDurationMs: executeDurationMs,
+                        totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2)
                       });
-                    case 9:
+                    case 21:
                     case "end":
                       return _context20.stop();
                   }
-                }, _callee20);
+                }, _callee20, null, [[4,, 7, 10], [12,, 15, 18]]);
               })));
-            case 6:
-              _context21.next = 12;
+            case 10:
+              _context21.next = 16;
               break;
-            case 8:
-              _context21.prev = 8;
-              _context21.t0 = _context21["catch"](3);
+            case 12:
+              _context21.prev = 12;
+              _context21.t0 = _context21["catch"](7);
               errorMessage = _context21.t0 instanceof Error ? _context21.t0.message : String(_context21.t0);
               this.logError('全量保存商品到 IndexDB 失败', {
                 source: source,
                 productCount: products.length,
+                queueWaitMs: queueWaitMs,
+                clearDurationMs: clearDurationMs,
+                writeDurationMs: writeDurationMs,
+                totalDurationMs: +(performance.now() - enqueuedAt).toFixed(2),
                 error: errorMessage
               });
-            case 12:
+            case 16:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[3, 8]]);
+        }, _callee21, this, [[7, 12]]);
       }));
       function replaceProductsSnapshotInIndexDB(_x21, _x22) {
         return _replaceProductsSnapshotInIndexDB.apply(this, arguments);
@@ -2110,6 +2171,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 source: 'IndexDB'
               });
               this.logInfo('预加载完成（从 IndexDB）', {
+                trigger: 'preload',
                 productCount: cachedData.length,
                 duration: "".concat(Math.round(performance.now() - tTotal), "ms"),
                 source: 'IndexDB'
@@ -2132,7 +2194,9 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
             case 29:
               tServer = performance.now();
               _context24.next = 32;
-              return this.loadProductsByServer();
+              return this.loadProductsByServer({
+                trigger: 'preload'
+              });
             case 32:
               products = _context24.sent;
               perfMark('preload.loadFromServer', performance.now() - tServer, {
@@ -2152,6 +2216,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                   source: 'Server'
                 });
                 this.logInfo('预加载完成（从服务器）', {
+                  trigger: 'preload',
                   productCount: products.length,
                   duration: "".concat(Math.round(performance.now() - tTotal), "ms"),
                   source: 'Server'
@@ -2776,64 +2841,91 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "silentRefresh",
     value: (function () {
       var _silentRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var t0, now, elapsedSincePreload, elapsedSinceFullFetch, products, errorMessage;
+        var options,
+          t0,
+          now,
+          trigger,
+          elapsedSincePreloadMs,
+          elapsedSinceFullFetchMs,
+          products,
+          errorMessage,
+          _args29 = arguments;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
+              options = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
               t0 = performance.now();
               now = Date.now();
-              elapsedSincePreload = now - this.lastPreloadCompletedAtMs;
-              elapsedSinceFullFetch = now - this.lastServerFullFetchAtMs;
-              if (!(this.lastPreloadCompletedAtMs > 0 && elapsedSincePreload < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS || this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS)) {
-                _context29.next = 6;
+              trigger = options.trigger || 'background';
+              elapsedSincePreloadMs = now - this.lastPreloadCompletedAtMs;
+              elapsedSinceFullFetchMs = now - this.lastServerFullFetchAtMs;
+              if (!(this.lastPreloadCompletedAtMs > 0 && elapsedSincePreloadMs < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS || this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetchMs < PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS)) {
+                _context29.next = 9;
                 break;
               }
+              this.logInfo('silentRefresh 跳过全量 SSE', {
+                trigger: trigger,
+                reason: 'within_min_interval',
+                minIntervalMs: PRODUCT_SILENT_REFRESH_MIN_INTERVAL_MS,
+                elapsedSincePreloadMs: elapsedSincePreloadMs,
+                elapsedSinceFullFetchMs: elapsedSinceFullFetchMs,
+                productCount: this.store.list.length
+              });
               return _context29.abrupt("return", this.store.list);
-            case 6:
-              this.logInfo('silentRefresh 开始');
-              _context29.prev = 7;
-              _context29.next = 10;
-              return this.loadProductsByServer();
-            case 10:
+            case 9:
+              this.logInfo('silentRefresh 开始', {
+                trigger: trigger,
+                elapsedSincePreloadMs: elapsedSincePreloadMs,
+                elapsedSinceFullFetchMs: elapsedSinceFullFetchMs,
+                productCount: this.store.list.length
+              });
+              _context29.prev = 10;
+              _context29.next = 13;
+              return this.loadProductsByServer({
+                trigger: trigger
+              });
+            case 13:
               products = _context29.sent;
               if (!(products && products.length > 0)) {
-                _context29.next = 21;
+                _context29.next = 24;
                 break;
               }
               this.store.list = products;
               this.syncProductsMap();
               this.clearPriceCache();
               this.core.effects.emit(ProductsHooks.onProductsChanged, this.store.list);
-              _context29.next = 18;
+              _context29.next = 21;
               return this.core.effects.emit(ProductsHooks.onProductsSyncCompleted, null);
-            case 18:
+            case 21:
               this.logInfo('silentRefresh 完成', {
+                trigger: trigger,
                 productCount: products.length,
                 duration: "".concat(Math.round(performance.now() - t0), "ms")
               });
-              _context29.next = 22;
+              _context29.next = 25;
               break;
-            case 21:
+            case 24:
               this.logWarning('silentRefresh: 服务器未返回数据');
-            case 22:
+            case 25:
               perfMark('silentRefresh', performance.now() - t0, {
                 count: this.store.list.length
               });
               return _context29.abrupt("return", this.store.list);
-            case 26:
-              _context29.prev = 26;
-              _context29.t0 = _context29["catch"](7);
+            case 29:
+              _context29.prev = 29;
+              _context29.t0 = _context29["catch"](10);
               errorMessage = _context29.t0 instanceof Error ? _context29.t0.message : String(_context29.t0);
               this.logError('silentRefresh 失败', {
+                trigger: trigger,
                 duration: "".concat(Math.round(performance.now() - t0), "ms"),
                 error: errorMessage
               });
               return _context29.abrupt("return", this.store.list);
-            case 31:
+            case 34:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this, [[7, 26]]);
+        }, _callee29, this, [[10, 29]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);

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

@@ -149,41 +149,49 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return this.setupResourceSync();
-            case 2:
-              _context2.next = 4;
               return this.loadResourcesFromSQLite();
-            case 4:
+            case 2:
               cachedResources = _context2.sent;
               if (!(cachedResources.length > 0)) {
-                _context2.next = 12;
+                _context2.next = 10;
                 break;
               }
               this.store.list = cloneDeep(cachedResources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 10;
+              _context2.next = 8;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
+            case 8:
+              // 二次启动优先使用 SQLite。pubsub 注册及远端校准继续在后台执行，
+              // setupResourceSync 完成后会合并最新数据并回写 SQLite。
+              void this.setupResourceSync().catch(function (error) {
+                _this3.logError('后台初始化资源同步失败', error);
+              });
+              return _context2.abrupt("return");
             case 10:
-              _context2.next = 20;
-              break;
+              _context2.next = 12;
+              return this.setupResourceSync();
             case 12:
-              _context2.next = 14;
+              if (!(this.store.list.length === 0)) {
+                _context2.next = 21;
+                break;
+              }
+              _context2.next = 15;
               return this.loadResourcesByServer();
-            case 14:
+            case 15:
               resources = _context2.sent;
               if (!(resources.length > 0)) {
-                _context2.next = 20;
+                _context2.next = 21;
                 break;
               }
               this.store.list = cloneDeep(resources).map(function (item) {
                 return _this3.normalizeResource(item);
               });
               this.syncResourcesMap();
-              _context2.next = 20;
+              _context2.next = 21;
               return this.safeEmit(ResourceHooks.onResourcesChanged, this.store.list);
-            case 20:
+            case 21:
             case "end":
               return _context2.stop();
           }

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

@@ -619,8 +619,7 @@ function formatBundlePrice(bundle, currencySymbol) {
   var _ref33, _ref34, _bundle$bundle_sellin;
   var value = (_ref33 = (_ref34 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref34 !== void 0 ? _ref34 : bundle.price) !== null && _ref33 !== void 0 ? _ref33 : 0;
   var amount = new Decimal(toMoneyNumber(value));
-  // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
-  var isNegative = bundle.price_type === 'markdown';
+  var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
   return formatMoney(amount, currencySymbol);
 }

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

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

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

@@ -63,8 +63,6 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
-    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
-    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;