@pisell/pisellos 2.3.67 → 2.3.68

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

@@ -579,6 +579,10 @@ export interface LoadSalesDetailParams {
      * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
      */
     preloadedSalesDetail?: Record<string, any>;
+    /**
+     * sessionStorage 快照复用详情 hydrate 时使用；不带该值时保持既有编辑订单语义。
+     */
+    hydrateSource?: 'sessionStorage';
     forceRemote?: boolean;
     merge?: boolean;
 }
@@ -749,8 +753,15 @@ export interface OrderModuleAPI {
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
-    /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
+    /** 在显式开启时保存当前 tempOrder 的 sessionStorage 会话快照。 */
     persistTempOrder: () => void;
+    /**
+     * 删除当前 cacheId 的 tempOrder 会话快照，并阻止当前模块实例再次写入。
+     * 新模块实例初始化时会按 otherParams 重新启用持久化。
+     */
+    clearSessionStoragePersistedTempOrder: () => void;
+    /** 取出一次待恢复的 sessionStorage tempOrder 快照。 */
+    consumeSessionStorageRestore: () => Record<string, any> | null;
     /**
      * 控制 IndexedDB 草稿（saveDraft）开关；localStorage tempOrder 持久化已废弃。
      * BigSale 弹窗等场景传 false 可跳过 saveDraft。
@@ -808,6 +819,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
+        source?: 'salesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/dist/modules/Order/utils/orderCollectionIdentity.d.ts

@@ -24,6 +24,16 @@ export interface NormalizeOrderCollectionsResult<T> {
     stats: Record<OrderCollectionKind, OrderCollectionIdentityStats>;
     uidRemaps: OrderCollectionUidRemap[];
 }
+export interface ProductLineIdentityRepair {
+    index: number;
+    from: string;
+    to: string;
+}
+export interface RepairDuplicateProductLineIdentitiesResult<T> {
+    products: T[];
+    productsByUid?: Record<string, Record<string, any>>;
+    repairs: ProductLineIdentityRepair[];
+}
 export declare function createUuidV4(): string;
 export declare function isBlankOrderCollectionIdentity(value: unknown): boolean;
 export declare function getOrderCollectionPersistentId(kind: OrderCollectionKind, item: unknown): string | null;
@@ -31,6 +41,11 @@ export declare function getOrderCollectionUid(kind: OrderCollectionKind, item: u
 export declare function buildOrderCollectionFallbackUid(kind: OrderCollectionKind, persistentId: string | number): string;
 export declare function getOrderCollectionReferenceUid(kind: OrderCollectionKind, item: unknown): string | null;
 export declare function setOrderCollectionUid<T>(kind: OrderCollectionKind, item: T, uid: string): T;
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export declare function repairDuplicateProductLineIdentities<T extends Record<string, any>>(products: T[] | null | undefined, productsByUid?: Record<string, Record<string, any>> | null): RepairDuplicateProductLineIdentitiesResult<T>;
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。
  */

package/dist/modules/Order/utils/orderCollectionIdentity.js

@@ -74,6 +74,81 @@ export function setOrderCollectionUid(kind, item, uid) {
   delete record[uidField];
   return record;
 }
+function getGoodPassResourceId(product) {
+  var _ref, _ref2, _goodPass$discount$re, _goodPass$discount;
+  var goodPass = (product.discount_list || []).find(function (item) {
+    var _item$discount, _item$discount2;
+    var type = (item === null || item === void 0 ? void 0 : item.type) || (item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.type) || (item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.tag);
+    return type === 'good_pass';
+  });
+  if (!goodPass) return null;
+  var resourceId = (_ref = (_ref2 = (_goodPass$discount$re = (_goodPass$discount = goodPass.discount) === null || _goodPass$discount === void 0 ? void 0 : _goodPass$discount.resource_id) !== null && _goodPass$discount$re !== void 0 ? _goodPass$discount$re : goodPass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : goodPass.discount_id) !== null && _ref !== void 0 ? _ref : goodPass.id;
+  return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
+}
+function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
+  var encodedOriginalUid = encodeURIComponent(originalUid);
+  var resourceId = getGoodPassResourceId(product);
+  if (resourceId) {
+    return "os-split:product:".concat(encodedOriginalUid, ":good-pass:").concat(encodeURIComponent(resourceId), ":").concat(duplicateOrdinal);
+  }
+  return "os-split:product:".concat(encodedOriginalUid, ":duplicate:").concat(duplicateOrdinal);
+}
+
+/**
+ * Rules 会把同一商品按商品券拆成多条真实订单行。拆行结果会继承原商品 UID，
+ * 因此必须在通用 collection normalization 之前为后续行派生稳定身份，避免被折叠。
+ */
+export function repairDuplicateProductLineIdentities(products, productsByUid) {
+  var repairedProducts = cloneDeep(products || []);
+  var repairedProductsByUid = productsByUid ? cloneDeep(productsByUid) : undefined;
+  var occupiedUids = new Set(repairedProducts.map(function (product) {
+    return getOrderCollectionUid('product', product);
+  }).filter(function (uid) {
+    return Boolean(uid);
+  }));
+  Object.keys(repairedProductsByUid || {}).forEach(function (uid) {
+    return occupiedUids.add(uid);
+  });
+  var occurrences = new Map();
+  var repairs = [];
+  repairedProducts.forEach(function (product, index) {
+    var originalUid = getOrderCollectionUid('product', product);
+    if (!originalUid) return;
+    var occurrence = (occurrences.get(originalUid) || 0) + 1;
+    occurrences.set(originalUid, occurrence);
+    if (occurrence === 1) return;
+    var duplicateOrdinal = occurrence - 1;
+    var baseCandidate = buildSplitProductUid(originalUid, product, duplicateOrdinal);
+    var nextUid = baseCandidate;
+    var conflictOrdinal = 1;
+    while (occupiedUids.has(nextUid)) {
+      nextUid = "".concat(baseCandidate, ":conflict:").concat(conflictOrdinal);
+      conflictOrdinal += 1;
+    }
+    var repairedProduct = setOrderCollectionUid('product', product, nextUid);
+    repairedProduct.identity_key = nextUid;
+    repairedProducts[index] = repairedProduct;
+    occupiedUids.add(nextUid);
+    repairs.push({
+      index: index,
+      from: originalUid,
+      to: nextUid
+    });
+    var runtimeSource = repairedProductsByUid === null || repairedProductsByUid === void 0 ? void 0 : repairedProductsByUid[originalUid];
+    if (runtimeSource && repairedProductsByUid) {
+      repairedProductsByUid[nextUid] = _objectSpread(_objectSpread({}, cloneDeep(runtimeSource)), runtimeSource.rowKey !== undefined ? {
+        rowKey: nextUid
+      } : {});
+    }
+  });
+  return _objectSpread(_objectSpread({
+    products: repairedProducts
+  }, repairedProductsByUid ? {
+    productsByUid: repairedProductsByUid
+  } : {}), {}, {
+    repairs: repairs
+  });
+}
 
 /**
  * 持久化行 ID 是服务端事实主键；只有至少一侧尚未持久化时，才允许用 runtime UID 对齐。

package/dist/modules/Order/utils.js

@@ -1401,7 +1401,6 @@ export function productRequiresFormSubject(tempOrder, product) {
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
-  debugger;
   // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
   if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
   if (product) return productRequiresFormSubject(tempOrder, product);

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

@@ -41,6 +41,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+    getPlatform(): string;
     private getPaymentNumberAppData;
     /**
      * 记录信息日志

package/dist/modules/Payment/index.js

@@ -231,6 +231,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       this.otherParams = params || {};
     }
+
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+  }, {
+    key: "getPlatform",
+    value: function getPlatform() {
+      var _this$otherParams;
+      return String(((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform) || '').trim().toLowerCase();
+    }
   }, {
     key: "getPaymentNumberAppData",
     value: function getPaymentNumberAppData(key) {
@@ -247,10 +257,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
-      var _this$otherParams;
-      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
-        var _this$otherParams2;
-        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+      var _this$otherParams2;
+      if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.fatherModule) {
+        var _this$otherParams3;
+        var fatherModule = this.core.getModule((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.fatherModule);
         if (fatherModule) {
           fatherModule.logInfo("".concat(title), metadata);
           return;

package/dist/modules/Payment/walletpass.js

@@ -5,15 +5,15 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -104,6 +104,26 @@ function mergeWalletAssets() {
   });
   return merged;
 }
+
+/**
+ * 聚合接口不保证 recalculate_list 顺序；派生抵扣额依赖选择顺序，
+ * 因此已选资产必须先恢复为 selectedIds 的顺序再进入策略计算。
+ */
+function orderWalletAssetsByIds(assets, orderedIds) {
+  var assetByKey = new Map(assets.map(function (asset) {
+    return [getWalletAssetKey(asset), asset];
+  }));
+  var orderedKeys = new Set(orderedIds.map(function (id) {
+    return String(id);
+  }));
+  return [].concat(_toConsumableArray(orderedIds.map(function (id) {
+    return assetByKey.get(String(id));
+  }).filter(function (asset) {
+    return asset !== undefined;
+  })), _toConsumableArray(assets.filter(function (asset) {
+    return !orderedKeys.has(getWalletAssetKey(asset));
+  })));
+}
 function createInitialWalletAssetsState() {
   return {
     status: 'idle',
@@ -620,7 +640,6 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 vouchers: allList
               });
               recommended = res.recommended, transformList = res.transformList, noApplicableVoucher = res.noApplicableVoucher, recommendedAmount = res.recommendedAmount;
-              console.log(res, 'resres12');
               this.walletRecommendList = recommended;
 
               // 存储初始化数据到内存中，供 useWalletPass 使用
@@ -640,19 +659,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 noApplicableVoucher: noApplicableVoucher,
                 products: products || []
               });
-            case 20:
-              _context3.prev = 20;
+            case 19:
+              _context3.prev = 19;
               _context3.t0 = _context3["catch"](0);
               this.paymentModule.logError('[WalletPass] 初始化钱包数据失败', _context3.t0, {
                 customer_id: baseParams.customer_id,
                 order_expect_amount: baseParams.order_expect_amount
               });
               throw _context3.t0;
-            case 24:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 20]]);
+        }, _callee3, this, [[0, 19]]);
       }));
       function initializeWalletDataAsync(_x3) {
         return _initializeWalletDataAsync.apply(this, arguments);
@@ -669,7 +688,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     value: (function () {
       var _aggregateRecalculateWalletAssetsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(businessData, selectedIds) {
         var _this$paymentModule$w7, _this$paymentModule$w8;
-        var walletParams, customerId, requestParams, response, responseData, hasAggregateLists, recalculateList, customerWalletPassList, allList, walletPassEvaluator, evaluated, returnedSelectedKeys, authoritativeSelectedIds;
+        var walletParams, customerId, requestParams, response, responseData, hasAggregateLists, recalculateList, customerWalletPassList, orderedRecalculateList, allList, walletPassEvaluator, evaluated, returnedSelectedKeys, authoritativeSelectedIds;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -705,7 +724,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 11:
               recalculateList = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.recalculate_list) ? responseData.recalculate_list : [];
               customerWalletPassList = Array.isArray(responseData === null || responseData === void 0 ? void 0 : responseData.customer_wallet_pass_list) ? responseData.customer_wallet_pass_list : [];
-              allList = mergeWalletAssets(recalculateList, customerWalletPassList);
+              orderedRecalculateList = orderWalletAssetsByIds(recalculateList, selectedIds);
+              allList = mergeWalletAssets(orderedRecalculateList, customerWalletPassList);
               walletPassEvaluator = (_this$paymentModule$w7 = this.paymentModule.window) === null || _this$paymentModule$w7 === void 0 || (_this$paymentModule$w8 = _this$paymentModule$w7.getWalletPassEvaluator) === null || _this$paymentModule$w8 === void 0 ? void 0 : _this$paymentModule$w8.call(_this$paymentModule$w7);
               evaluated = walletPassEvaluator !== null && walletPassEvaluator !== void 0 && walletPassEvaluator.getRecommendedVouchers ? walletPassEvaluator.getRecommendedVouchers({
                 orderTotalAmount: walletParams.order_wait_pay_amount,
@@ -749,7 +769,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 products: walletParams.products || [],
                 authoritativeSelectedIds: authoritativeSelectedIds
               });
-            case 24:
+            case 25:
             case "end":
               return _context4.stop();
           }
@@ -831,7 +851,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, platform, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -844,6 +864,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
               return _context6.abrupt("return", []);
             case 5:
+              platform = this.paymentModule.getPlatform();
+              if (!(platform === 'pc' || platform === 'h5')) {
+                _context6.next = 11;
+                break;
+              }
+              this.userIdentificationCodes = [];
+              this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+                userIdentificationCodes: []
+              });
+              this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
+                platform: platform
+              });
+              return _context6.abrupt("return", []);
+            case 11:
               if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
                 newParams.payment_order_id = undefined;
               }
@@ -854,9 +888,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams4 = this.walletParams) === null || _this$walletParams4 === void 0 ? void 0 : _this$walletParams4.payment_order_id
               });
-              _context6.next = 9;
+              _context6.next = 15;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 9:
+            case 15:
               response = _context6.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -877,19 +911,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context6.abrupt("return", this.userIdentificationCodes);
-            case 17:
-              _context6.prev = 17;
+            case 23:
+              _context6.prev = 23;
               _context6.t0 = _context6["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context6.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context6.abrupt("return", []);
-            case 21:
+            case 27:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 17]]);
+        }, _callee6, this, [[0, 23]]);
       }));
       function getUserIdentificationCodeListAsync(_x7) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);

package/dist/modules/Quotation/index.d.ts

@@ -9,8 +9,6 @@ export declare class QuotationModule extends BaseModule implements Module {
     private request;
     private store;
     private scheduleResolver?;
-    private app;
-    private quotationListUpdatedListener?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
@@ -18,7 +16,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
-    setQuotationListUpdatedListener(listener?: () => void): void;
     getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
@@ -63,9 +60,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private applyQuotationResponse;
-    private notifyQuotationListUpdated;
-    private getQuotationCacheKeyData;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private normalizeCustomerId;

package/dist/modules/Quotation/index.js

@@ -1,10 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -40,15 +36,12 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       list: []
     });
     _defineProperty(_assertThisInitialized(_this), "scheduleResolver", void 0);
-    _defineProperty(_assertThisInitialized(_this), "app", void 0);
-    _defineProperty(_assertThisInitialized(_this), "quotationListUpdatedListener", void 0);
     return _this;
   }
   _createClass(QuotationModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _core$getPlugin, _core$getPlugin$getAp;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -60,11 +53,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('QuotationModule 需要 request 插件支持');
             case 4:
-              this.app = (_core$getPlugin = core.getPlugin('app')) === null || _core$getPlugin === void 0 || (_core$getPlugin$getAp = _core$getPlugin.getApp) === null || _core$getPlugin$getAp === void 0 ? void 0 : _core$getPlugin$getAp.call(_core$getPlugin);
               this.store = {
                 list: []
               };
-            case 6:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -79,8 +71,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadQuotations",
     value: function () {
       var _loadQuotations = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _this2 = this;
-        var query, initialResultApplied, applyRemoteUpdate, res;
+        var _data;
+        var query, res, list;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -89,27 +81,19 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              initialResultApplied = false;
-              applyRemoteUpdate = function applyRemoteUpdate(response) {
-                _this2.applyQuotationResponse(response);
-                if (initialResultApplied) {
-                  _this2.notifyQuotationListUpdated();
-                }
-              };
-              _context2.next = 7;
+              _context2.next = 5;
               return this.request.get('/quotation/available', query, {
-                cache: {
-                  type: 'indexDB',
-                  updateCache: true,
-                  cacheKeyData: this.getQuotationCacheKeyData(query)
-                },
-                cacheUpdateChange: applyRemoteUpdate
+                useCache: false,
+                osServer: true
               });
-            case 7:
+            case 5:
               res = _context2.sent;
-              this.applyQuotationResponse(res);
-              initialResultApplied = true;
-            case 10:
+              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
+              list.sort(function (a, b) {
+                return b.sort - a.sort;
+              });
+              this.store.list = list;
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -125,15 +109,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationList() {
       return this.store.list;
     }
-  }, {
-    key: "setQuotationListUpdatedListener",
-    value: function setQuotationListUpdatedListener(listener) {
-      this.quotationListUpdatedListener = listener;
-    }
   }, {
     key: "getQuotationCustomerScopeInfo",
     value: function getQuotationCustomerScopeInfo() {
-      var _this3 = this;
+      var _this2 = this;
       var customerById = new Map();
       var quotationScopes = this.store.list.filter(function (quotation) {
         return Array.isArray(quotation.customer) && quotation.customer.length > 0;
@@ -143,7 +122,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
         var localSeen = new Set();
         var quotationCustomers = quotation.customer || [];
         quotationCustomers.forEach(function (customer) {
-          var customerId = _this3.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
+          var customerId = _this2.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
           if (!customerId || localSeen.has(customerId)) return;
           localSeen.add(customerId);
           customerIds.push(customerId);
@@ -268,41 +247,6 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
-  }, {
-    key: "applyQuotationResponse",
-    value: function applyQuotationResponse(response) {
-      var _data;
-      var source = (response === null || response === void 0 || (_data = response.data) === null || _data === void 0 ? void 0 : _data.list) || (response === null || response === void 0 ? void 0 : response.list) || [];
-      this.store.list = _toConsumableArray(source).sort(function (a, b) {
-        return Number(b.sort || 0) - Number(a.sort || 0);
-      });
-    }
-  }, {
-    key: "notifyQuotationListUpdated",
-    value: function notifyQuotationListUpdated() {
-      try {
-        var _this$quotationListUp;
-        (_this$quotationListUp = this.quotationListUpdatedListener) === null || _this$quotationListUp === void 0 || _this$quotationListUp.call(this);
-      } catch (error) {
-        console.warn('[QuotationModule] 报价单后台更新回调失败', error);
-      }
-    }
-  }, {
-    key: "getQuotationCacheKeyData",
-    value: function getQuotationCacheKeyData(query) {
-      var shopId = '';
-      try {
-        var _this$app, _this$app$getStorage;
-        var storedCore = (_this$app = this.app) === null || _this$app === void 0 || (_this$app = _this$app.storage) === null || _this$app === void 0 || (_this$app$getStorage = _this$app.getStorage) === null || _this$app$getStorage === void 0 ? void 0 : _this$app$getStorage.call(_this$app, 'core');
-        var coreInfo = typeof storedCore === 'string' ? JSON.parse(storedCore || '{}') : storedCore || {};
-        shopId = String((coreInfo === null || coreInfo === void 0 ? void 0 : coreInfo.id) || '');
-      } catch (_unused) {
-        // 缓存隔离信息读取失败时仍按请求参数缓存。
-      }
-      return _objectSpread(_objectSpread({}, query), {}, {
-        shop_id: shopId
-      });
-    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -329,17 +273,17 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this4 = this;
+        _this3 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = [];
       quotation.schedule.forEach(function (s) {
-        var _this4$scheduleResolv;
-        var full = (_this4$scheduleResolv = _this4.scheduleResolver) === null || _this4$scheduleResolv === void 0 ? void 0 : _this4$scheduleResolv.call(_this4, s.id);
+        var _this3$scheduleResolv;
+        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
         if (full) {
           scheduleItems.push(full);
           return;
         }
-        if (_this4.scheduleResolver) {
+        if (_this3.scheduleResolver) {
           return;
         }
         var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {