@pisell/pisellos 2.3.81 → 2.3.83

package/dist/modules/ProductList/index.js

@@ -27,6 +27,7 @@ import { BaseModule } from "../BaseModule";
 import { cloneDeep } from 'lodash-es';
 import dayjs from 'dayjs';
 import { isProductQueryHandledByOsServer, PRODUCT_QUERY_DATA_VARIANT_RELATIONS, resolveClientDataVariants } from "./clientDataVariants";
+import { isCustomerUserPlatform } from "../../utils/platform";
 export * from "./types";
 export var ProductList = /*#__PURE__*/function (_BaseModule) {
   _inherits(ProductList, _BaseModule);
@@ -40,6 +41,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
+    _defineProperty(_assertThisInitialized(_this), "rawProductPriceSources", new Map());
     return _this;
   }
   _createClass(ProductList, [{
@@ -53,6 +55,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store;
               this.otherParams = options.otherParams || {};
+              this.rawProductPriceSources.clear();
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list.slice().sort(function (a, b) {
                   return Number(b.sort) - Number(a.sort);
@@ -63,7 +66,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.selectProducts = [];
               }
               this.request = core.getPlugin('request');
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -140,6 +143,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _this$otherParams,
+          _this$otherParams2,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -210,8 +214,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               };
               rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
               mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
-                open_quotation: 1,
+              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform) ? {} : {
+                open_quotation: 1
+              }), {}, {
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
                 with: _toConsumableArray(PRODUCT_QUERY_DATA_VARIANT_RELATIONS),
@@ -257,6 +262,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                         originalCallback(result);
                         return _context4.abrupt("return");
                       case 4:
+                        if (!handledByOsServer) {
+                          // Subscription callbacks may contain only changed products. Upsert
+                          // their raw records without evicting other IDs from the scope.
+                          _this2.rememberRawProductQueryResult(callbackList);
+                        }
                         products = resolveClientDataVariants({
                           core: _this2.core,
                           otherParams: _this2.otherParams,
@@ -264,15 +274,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                           queryPayload: queryPayload,
                           handledByOsServer: handledByOsServer
                         });
-                        _context4.next = 7;
+                        _context4.next = 8;
                         return _this2.addProduct(products);
-                      case 7:
+                      case 8:
                         originalCallback(handledByOsServer ? result : _objectSpread(_objectSpread({}, result), {}, {
                           data: _objectSpread(_objectSpread({}, result.data), {}, {
                             list: products
                           })
                         }));
-                      case 8:
+                      case 9:
                       case "end":
                         return _context4.stop();
                     }
@@ -291,6 +301,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               });
             case 14:
               productsData = _context5.sent;
+              if (!handledByOsServer && Array.isArray(productsData.data.list)) {
+                this.replaceRawProductQueryResult(productsData.data.list, product_ids);
+              }
               resolvedList = resolveClientDataVariants({
                 core: this.core,
                 otherParams: this.otherParams,
@@ -309,7 +322,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context5.abrupt("return", sortedList);
-            case 19:
+            case 20:
             case "end":
               return _context5.stop();
           }
@@ -352,6 +365,60 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProductsPrice;
     }()
+    /**
+     * Remember raw remote product records before client-side Data Variant
+     * evaluation. Quote-only reads can then always start from a clean baseline.
+     */
+  }, {
+    key: "rememberRawProductQueryResult",
+    value: function rememberRawProductQueryResult(products) {
+      var _this3 = this;
+      if (!Array.isArray(products)) return;
+      products.forEach(function (product) {
+        var _source$id;
+        var source = product;
+        var id = Number((_source$id = source === null || source === void 0 ? void 0 : source.id) !== null && _source$id !== void 0 ? _source$id : source === null || source === void 0 ? void 0 : source.product_id);
+        if (!Number.isFinite(id)) return;
+        _this3.rawProductPriceSources.set(id, cloneDeep(product));
+      });
+    }
+  }, {
+    key: "replaceRawProductQueryResult",
+    value: function replaceRawProductQueryResult(products, requestedIds) {
+      var _this4 = this;
+      if (Array.isArray(requestedIds) && requestedIds.length > 0) {
+        requestedIds.forEach(function (rawId) {
+          var id = Number(rawId);
+          if (Number.isFinite(id)) _this4.rawProductPriceSources.delete(id);
+        });
+      } else {
+        // A non-ID query represents the latest catalog scope. Clearing before
+        // replacing prevents removed products from surviving indefinitely.
+        this.rawProductPriceSources.clear();
+      }
+      this.rememberRawProductQueryResult(products);
+    }
+
+    /**
+     * Return isolated raw price sources for the requested products.
+     *
+     * Missing IDs are intentionally omitted so callers can remotely fetch only
+     * the incomplete part of a batch quote.
+     */
+  }, {
+    key: "getRawProductPriceSources",
+    value: function getRawProductPriceSources(ids) {
+      var _this5 = this;
+      var products = new Map();
+      if (!Array.isArray(ids)) return products;
+      ids.forEach(function (rawId) {
+        var id = Number(rawId);
+        if (!Number.isFinite(id) || products.has(id)) return;
+        var product = _this5.rawProductPriceSources.get(id);
+        if (product) products.set(id, cloneDeep(product));
+      });
+      return products;
+    }
   }, {
     key: "getProducts",
     value: function () {
@@ -430,7 +497,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "addProduct",
     value: function () {
       var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(products) {
-        var _this3 = this;
+        var _this6 = this;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -439,13 +506,13 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.list = [];
               }
               products.forEach(function (n) {
-                var index = _this3.store.list.findIndex(function (m) {
+                var index = _this6.store.list.findIndex(function (m) {
                   return m.id === n.id;
                 });
                 if (index === -1) {
-                  _this3.store.list.push(n);
+                  _this6.store.list.push(n);
                 } else {
-                  _this3.store.list[index] = n;
+                  _this6.store.list[index] = n;
                 }
               });
               // 根据 sort 值做降序排序（数字越大越靠前）

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

@@ -129,8 +129,23 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
+    private isCustomerUserPriceQuery;
+    private getPriceQueryScheduleList;
+    private buildPriceQueryPayload;
+    private getRawProductPriceSources;
+    private rememberRawProductPriceSources;
+    private getSelectedProductVariantId;
+    /**
+     * 将目录原始商品还原为本次选择的 SKU 基线。
+     *
+     * 这里绝不能复用已评估后的目录商品，否则从命中智能价切回不命中的
+     * 日期时会残留旧价格。套餐仅验证所选关系存在，最终仍由 merge 方法把
+     * 评估后的套餐价格映射回用户的选择数据。
+     */
+    private prepareRawProductForPriceQuery;
+    private resolveLocalProductForPriceQuery;
     private loadProductsForPriceQuery;
-    private loadProductForPriceQuery;
+    private resolveProductsForPriceQuery;
     private getAuthoritativeBundleItems;
     private findAuthoritativeBundleItem;
     private getAuthoritativeBundleUnitPrice;