@pisell/pisellos 2.3.1 → 2.3.3

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

@@ -24,6 +24,9 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
+    private quotationScheduleCache;
+    private quotationScheduleCacheSource;
+    private quotationScheduleCacheLoaded;
     private productDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -75,6 +78,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     }): Promise<void>;
     private ensureQuotationBridgeReady;
     private getQuotationBridgeScopeKey;
+    private getQuotedPrice;
     private buildPriceDataFromQuotation;
     private buildVariantPriceData;
     private buildBundleGroupPriceData;

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

@@ -77,6 +77,9 @@ 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), "quotationScheduleCache", new Map());
+    _defineProperty(_assertThisInitialized(_this), "quotationScheduleCacheSource", null);
+    _defineProperty(_assertThisInitialized(_this), "quotationScheduleCacheLoaded", false);
     // ---- 商品数据同步相关 ----
     _defineProperty(_assertThisInitialized(_this), "productDataSource", void 0);
     _defineProperty(_assertThisInitialized(_this), "pendingSyncMessages", []);
@@ -283,8 +286,9 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "setupQuotationPriceBridge",
     value: (function () {
       var _setupQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _this$otherParams;
-        var channel, quotation, scheduleCache, hasLoadedScheduleList;
+        var _this$otherParams,
+          _this3 = this;
+        var channel, quotation;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -308,13 +312,18 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.quotationPriceBridge = quotation;
             case 10:
               if (params.scheduleModule) {
-                scheduleCache = new Map();
-                hasLoadedScheduleList = false;
+                if (this.quotationScheduleCacheSource !== params.scheduleModule) {
+                  this.quotationScheduleCache.clear();
+                  this.quotationScheduleCacheLoaded = false;
+                  this.quotationScheduleCacheSource = params.scheduleModule;
+                }
                 this.quotationPriceBridge.setScheduleResolver(function (id) {
                   var _params$scheduleModul3, _params$scheduleModul4, _params$scheduleModul5, _params$scheduleModul6;
                   var scheduleId = String(id);
-                  if (scheduleCache.has(scheduleId)) return scheduleCache.get(scheduleId);
-                  if (!hasLoadedScheduleList) {
+                  if (_this3.quotationScheduleCache.has(scheduleId)) {
+                    return _this3.quotationScheduleCache.get(scheduleId);
+                  }
+                  if (!_this3.quotationScheduleCacheLoaded) {
                     var _params$scheduleModul, _params$scheduleModul2;
                     var scheduleList = ((_params$scheduleModul = (_params$scheduleModul2 = params.scheduleModule).getScheduleList) === null || _params$scheduleModul === void 0 ? void 0 : _params$scheduleModul.call(_params$scheduleModul2)) || [];
                     var _iterator = _createForOfIteratorHelper(scheduleList),
@@ -322,18 +331,20 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                     try {
                       for (_iterator.s(); !(_step = _iterator.n()).done;) {
                         var schedule = _step.value;
-                        scheduleCache.set(String(schedule.id), schedule);
+                        _this3.quotationScheduleCache.set(String(schedule.id), schedule);
                       }
                     } catch (err) {
                       _iterator.e(err);
                     } finally {
                       _iterator.f();
                     }
-                    hasLoadedScheduleList = true;
+                    _this3.quotationScheduleCacheLoaded = true;
+                  }
+                  if (_this3.quotationScheduleCache.has(scheduleId)) {
+                    return _this3.quotationScheduleCache.get(scheduleId);
                   }
-                  if (scheduleCache.has(scheduleId)) return scheduleCache.get(scheduleId);
                   var schedules = ((_params$scheduleModul3 = (_params$scheduleModul4 = params.scheduleModule).getScheduleListByIds) === null || _params$scheduleModul3 === void 0 ? void 0 : _params$scheduleModul3.call(_params$scheduleModul4, [id])) || ((_params$scheduleModul5 = (_params$scheduleModul6 = params.scheduleModule).getScheduleByIds) === null || _params$scheduleModul5 === void 0 ? void 0 : _params$scheduleModul5.call(_params$scheduleModul6, [id])) || [];
-                  if (schedules[0]) scheduleCache.set(scheduleId, schedules[0]);
+                  if (schedules[0]) _this3.quotationScheduleCache.set(scheduleId, schedules[0]);
                   return schedules[0];
                 });
               }
@@ -360,7 +371,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "refreshQuotationPriceBridge",
     value: (function () {
       var _refreshQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _this3 = this;
+        var _this4 = this;
         var refreshKey;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -392,10 +403,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
                 channel: this.quotationBridgeChannel
               }).then(function () {
-                _this3.quotationBridgeLoadedKey = refreshKey;
+                _this4.quotationBridgeLoadedKey = refreshKey;
               }).finally(function () {
-                _this3.quotationBridgeRefreshPromise = undefined;
-                _this3.quotationBridgeRefreshKey = undefined;
+                _this4.quotationBridgeRefreshPromise = undefined;
+                _this4.quotationBridgeRefreshKey = undefined;
               });
               _context4.next = 14;
               return this.quotationBridgeRefreshPromise;
@@ -461,14 +472,34 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationBridgeScopeKey() {
       return this.quotationBridgeChannel || '';
     }
+  }, {
+    key: "getQuotedPrice",
+    value: function getQuotedPrice(params) {
+      var quotation = this.quotationPriceBridge;
+      if (!quotation) return null;
+      var query = {
+        productId: params.productId,
+        variantId: params.variantId,
+        datetime: params.datetime,
+        customer_id: params.customerId
+      };
+      if (typeof quotation.getQuotationMatchForProduct === 'function') {
+        var _quotation$getQuotati, _quotation$getQuotati2;
+        return (_quotation$getQuotati = (_quotation$getQuotati2 = quotation.getQuotationMatchForProduct(query)) === null || _quotation$getQuotati2 === void 0 ? void 0 : _quotation$getQuotati2.price) !== null && _quotation$getQuotati !== void 0 ? _quotation$getQuotati : null;
+      }
+      if (typeof quotation.getPriceForProduct === 'function') {
+        return quotation.getPriceForProduct(query);
+      }
+      return null;
+    }
   }, {
     key: "buildPriceDataFromQuotation",
     value: function buildPriceDataFromQuotation(product, datetime, customerId) {
-      var _this$quotationPriceB, _ref2, _ref3;
-      var quotedPrice = (_this$quotationPriceB = this.quotationPriceBridge) === null || _this$quotationPriceB === void 0 ? void 0 : _this$quotationPriceB.getPriceForProduct({
+      var _ref2, _ref3;
+      var quotedPrice = this.getQuotedPrice({
         productId: product.id,
         datetime: datetime,
-        customer_id: customerId
+        customerId: customerId
       });
       var productPrice = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : product.price;
       var productBasePrice = (_ref2 = (_ref3 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : product.base_price) !== null && _ref3 !== void 0 ? _ref3 : product.price) !== null && _ref2 !== void 0 ? _ref2 : 0;
@@ -483,15 +514,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildVariantPriceData",
     value: function buildVariantPriceData(product, datetime, customerId) {
-      var _this4 = this;
+      var _this5 = this;
       if (!Array.isArray(product.variant)) return [];
       return product.variant.map(function (variant) {
-        var _this4$quotationPrice, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _variant$product_id;
-        var quotedPrice = (_this4$quotationPrice = _this4.quotationPriceBridge) === null || _this4$quotationPrice === void 0 ? void 0 : _this4$quotationPrice.getPriceForProduct({
+        var _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _variant$product_id;
+        var quotedPrice = _this5.getQuotedPrice({
           productId: product.id,
           variantId: Number(variant.id),
           datetime: datetime,
-          customer_id: customerId
+          customerId: customerId
         });
         var price = (_ref4 = (_ref5 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : variant.price) !== null && _ref5 !== void 0 ? _ref5 : product.price) !== null && _ref4 !== void 0 ? _ref4 : 0;
         var basePrice = (_ref6 = (_ref7 = (_ref8 = (_ref9 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : variant.base_price) !== null && _ref9 !== void 0 ? _ref9 : variant.price) !== null && _ref8 !== void 0 ? _ref8 : product.base_price) !== null && _ref7 !== void 0 ? _ref7 : product.price) !== null && _ref6 !== void 0 ? _ref6 : 0;
@@ -506,20 +537,20 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildBundleGroupPriceData",
     value: function buildBundleGroupPriceData(product, datetime, customerId) {
-      var _this5 = this;
+      var _this6 = this;
       if (!Array.isArray(product.bundle_group)) return [];
       return product.bundle_group.map(function (group) {
         return {
           id: Number(group.id),
           bundle_item: (group.bundle_item || []).map(function (item) {
-            var _this5$quotationPrice, _ref10, _ref11, _ref12, _item$product_id, _item$group_id;
+            var _ref10, _ref11, _ref12, _item$product_id, _item$group_id;
             var bundleProductId = Number(item.bundle_product_id);
             var bundleVariantId = Number(item.bundle_variant_id || 0);
-            var quotedPrice = (_this5$quotationPrice = _this5.quotationPriceBridge) === null || _this5$quotationPrice === void 0 ? void 0 : _this5$quotationPrice.getPriceForProduct({
+            var quotedPrice = _this6.getQuotedPrice({
               productId: bundleProductId,
               variantId: bundleVariantId,
               datetime: datetime,
-              customer_id: customerId
+              customerId: customerId
             });
             var price = (_ref10 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0;
             var basePrice = (_ref11 = (_ref12 = quotedPrice !== null && quotedPrice !== void 0 ? quotedPrice : item.base_price) !== null && _ref12 !== void 0 ? _ref12 : item.price) !== null && _ref11 !== void 0 ? _ref11 : 0;
@@ -1660,7 +1691,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "replaceProductsSnapshotInIndexDB",
     value: (function () {
       var _replaceProductsSnapshotInIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(products, source) {
-        var _this6 = this;
+        var _this7 = this;
         var errorMessage;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -1679,25 +1710,25 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
-                      _this6.logInfo('replaceProductsSnapshotInIndexDB 开始', {
+                      _this7.logInfo('replaceProductsSnapshotInIndexDB 开始', {
                         source: source,
                         productCount: products.length
                       });
                       t0 = performance.now();
                       _context19.next = 4;
-                      return _this6.dbManager.clear(INDEXDB_STORE_NAME);
+                      return _this7.dbManager.clear(INDEXDB_STORE_NAME);
                     case 4:
                       if (!(products.length > 0)) {
                         _context19.next = 7;
                         break;
                       }
                       _context19.next = 7;
-                      return _this6.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
+                      return _this7.dbManager.bulkUpdate(INDEXDB_STORE_NAME, products);
                     case 7:
                       perfMark('replaceProductsSnapshotInIndexDB', performance.now() - t0, {
                         count: products.length
                       });
-                      _this6.logInfo('replaceProductsSnapshotInIndexDB 完成', {
+                      _this7.logInfo('replaceProductsSnapshotInIndexDB 完成', {
                         source: source,
                         productCount: products.length
                       });
@@ -1741,7 +1772,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "patchProductsInIndexDB",
     value: (function () {
       var _patchProductsInIndexDB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(products, source) {
-        var _this7 = this;
+        var _this8 = this;
         var mergeActions,
           validProducts,
           errorMessage,
@@ -1772,22 +1803,22 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee21$(_context21) {
                   while (1) switch (_context21.prev = _context21.next) {
                     case 0:
-                      _this7.logInfo('patchProductsInIndexDB 开始', {
+                      _this8.logInfo('patchProductsInIndexDB 开始', {
                         source: source,
                         count: validProducts.length
                       });
                       t0 = performance.now();
-                      if (!(typeof _this7.dbManager.bulkUpdate === 'function')) {
+                      if (!(typeof _this8.dbManager.bulkUpdate === 'function')) {
                         _context21.next = 7;
                         break;
                       }
                       _context21.next = 5;
-                      return _this7.dbManager.bulkUpdate(INDEXDB_STORE_NAME, validProducts);
+                      return _this8.dbManager.bulkUpdate(INDEXDB_STORE_NAME, validProducts);
                     case 5:
                       _context21.next = 25;
                       break;
                     case 7:
-                      if (!(typeof _this7.dbManager.update === 'function')) {
+                      if (!(typeof _this8.dbManager.update === 'function')) {
                         _context21.next = 25;
                         break;
                       }
@@ -1801,7 +1832,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       product = _step10.value;
                       _context21.next = 15;
-                      return _this7.dbManager.update(INDEXDB_STORE_NAME, product);
+                      return _this8.dbManager.update(INDEXDB_STORE_NAME, product);
                     case 15:
                       _context21.next = 11;
                       break;
@@ -1820,7 +1851,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                       perfMark('patchProductsInIndexDB', performance.now() - t0, {
                         count: validProducts.length
                       });
-                      _this7.logInfo('patchProductsInIndexDB 完成', {
+                      _this8.logInfo('patchProductsInIndexDB 完成', {
                         source: source,
                         count: validProducts.length
                       });
@@ -2018,7 +2049,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setupProductSync",
     value: function setupProductSync() {
-      var _this8 = this;
+      var _this9 = this;
       if (!this.productDataSource) {
         this.logWarning('setupProductSync: ProductDataSource 不可用，跳过同步初始化');
         return;
@@ -2028,20 +2059,20 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
           var data = (message === null || message === void 0 ? void 0 : message.data) || message;
           if (!data) return;
           console.log("[ProductsModule] \u6536\u5230\u540C\u6B65\u6D88\u606F [".concat(channelKey, "]:"), data);
-          _this8.logInfo('收到同步消息', {
+          _this9.logInfo('收到同步消息', {
             channelKey: channelKey,
             action: data.action,
             id: data.id,
             action_filed: data.action_filed
           });
-          _this8.pendingSyncMessages.push(_objectSpread(_objectSpread({}, data), {}, {
+          _this9.pendingSyncMessages.push(_objectSpread(_objectSpread({}, data), {}, {
             _channelKey: channelKey
           }));
-          if (_this8.syncTimer) {
-            clearTimeout(_this8.syncTimer);
+          if (_this9.syncTimer) {
+            clearTimeout(_this9.syncTimer);
           }
-          _this8.syncTimer = setTimeout(function () {
-            _this8.processProductSyncMessages();
+          _this9.syncTimer = setTimeout(function () {
+            _this9.processProductSyncMessages();
           }, PRODUCT_SYNC_DEBOUNCE_MS);
         };
       };
@@ -2059,7 +2090,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       }).catch(function (err) {
-        _this8.logError('setupProductSync: DataSource run 出错', {
+        _this9.logError('setupProductSync: DataSource run 出错', {
           error: err instanceof Error ? err.message : String(err)
         });
       });

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

@@ -1,6 +1,8 @@
 import { Module, PisellCore, ModuleOptions } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import { QuotationData } from './types';
+import type { ScheduleItem } from '../../../modules/Schedule/types';
+import type { QuotationCustomerScopeInfo } from '../../../modules/Quotation/types';
 /**
  * 报价单模块 - 用于管理报价单数据和计算商品价格
  */
@@ -10,6 +12,7 @@ export declare class QuotationModule extends BaseModule implements Module {
     private request;
     private store;
     private dbManager;
+    private scheduleResolver?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -25,10 +28,46 @@ export declare class QuotationModule extends BaseModule implements Module {
      * 获取报价单列表
      */
     getQuotationList(): QuotationData[];
+    loadQuotations(params?: {
+        channel?: string;
+        customer_id?: number | string;
+    }): Promise<void>;
+    setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    getPriceForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): string | null;
+    getQuotationMatchForProduct(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): {
+        price: string | null;
+        quotationShelfId: number;
+    } | null;
+    getQuotationShelfId(params: {
+        productId: number;
+        variantId?: number;
+        datetime: string;
+        channel?: string;
+        customer_id?: number | string;
+    }): number;
+    getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * 清空缓存
      */
     clear(): Promise<void>;
+    private normalizeCustomerId;
+    private hasValidCustomerId;
+    private isQuotationVisibleForCustomer;
+    private isQuotationVisibleForChannel;
+    private isQuotationActiveAt;
+    private findProductData;
     /**
      * 从 IndexDB 加载报价单数据
      * @private