@pisell/pisellos 2.3.67 → 2.3.69

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/Rules/index.js

@@ -1195,11 +1195,26 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
         var explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== 'good_pass' ? explicitlySelectedDiscount : undefined;
 
-        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        // 商品数量等变化会触发无 discountId 的重算。只要当前行已应用的折扣卡仍在
+        // applicableDiscounts 中，就应保留该行选择，避免被自动排序中力度更大的卡替换。
+        var appliedDiscountCardIds = new Set((product.discount_list || []).filter(function (item) {
+          return ['discount_card', 'product_discount_card'].includes((item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 ? void 0 : item.type));
+        }).map(function (item) {
+          var _ref12, _item$discount$resour, _item$discount;
+          return (_ref12 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref12 !== void 0 ? _ref12 : item === null || item === void 0 ? void 0 : item.id;
+        }).filter(function (id) {
+          return id !== undefined && id !== null;
+        }).map(String));
+        var appliedDiscountCard = options !== null && options !== void 0 && options.scan ? undefined : applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+        });
+
+        // 优先级：本次显式选择 > 当前行既有选择 > 扫码选择 > 自动排序第一项。
         var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
-        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
+        var selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
         var prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === 'good_pass' ? [explicitlySelectedDiscount].concat(_toConsumableArray(applicableDiscounts.filter(function (discount) {
           var discountType = discount.tag || discount.type;
@@ -1217,8 +1232,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref12;
-            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+            var _ref13;
+            return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -1234,8 +1249,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref13;
-              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
+              var _ref14;
+              return !((_ref14 = item.discount_list || []) !== null && _ref14 !== void 0 && _ref14.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1247,8 +1262,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis7;
           // 主商品：检查自己的 discount_list
           if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
-            var _item$discount;
-            return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
+            var _item$discount2;
+            return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
           })) {
             isManualDiscount = false;
           }
@@ -1256,11 +1271,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'bundle') {
             var _product$discount_lis8, _flatItem$parentProdu7;
             if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
-              var _item$discount2;
-              return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
+              var _item$discount4;
+              return ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id) === options.discountId;
             })) {
               isManualDiscount = false;
             }
@@ -1272,8 +1287,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
             var _options$selectedList2;
             return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
-              var _item$discount4;
-              return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
+              var _item$discount5;
+              return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
             });
           })) {
             isManualDiscount = false;
@@ -1284,14 +1299,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
-                var _item$discount5;
-                return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
+                var _item$discount6;
+                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
               var _options$selectedList4;
               return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
-                var _item$discount6;
-                return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
+                var _item$discount7;
+                return n.discountId === ((_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.resource_id);
               });
             })) {
               isManualDiscount = false;
@@ -1328,8 +1343,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref14, _product$_promotion$f, _product12, _product$origin_total;
-              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref15, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref15 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref15 !== void 0 ? _ref15 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -2027,7 +2042,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref17, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -2042,9 +2057,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref15, _item$bundle_selling_;
+                        var _item$price, _ref16, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref16 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref16 !== void 0 ? _ref16 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -2071,7 +2086,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
+                var mainSellingPrice = (_ref17 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref17 !== void 0 ? _ref17 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2220,14 +2235,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref17 = packageScope || {},
-        scopeType = _ref17.type,
-        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
-        _ref17$include_bundle = _ref17.include_bundle_product_ids,
-        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
-        _ref17$filter = _ref17.filter,
-        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
+      var _ref18 = packageScope || {},
+        scopeType = _ref18.type,
+        _ref18$exclude_bundle = _ref18.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref18$exclude_bundle === void 0 ? [] : _ref18$exclude_bundle,
+        _ref18$include_bundle = _ref18.include_bundle_product_ids,
+        include_bundle_product_ids = _ref18$include_bundle === void 0 ? [] : _ref18$include_bundle,
+        _ref18$filter = _ref18.filter,
+        filter = _ref18$filter === void 0 ? 0 : _ref18$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
       var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;

package/dist/server/index.js

@@ -6005,9 +6005,7 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: checkoutData,
                 order: pendingOrder,
                 response: pendingResult,
-                requireFullyPaid: true,
-                // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
-                isManualPrint: true
+                requireFullyPaid: true
               });
             case 18:
               _context60.next = 20;
@@ -6093,9 +6091,8 @@ var Server = /*#__PURE__*/function () {
                 checkoutData: syncResult.checkoutData,
                 order: syncedOrder,
                 response: syncResult.normalizedResponse,
-                requireFullyPaid: true,
+                requireFullyPaid: true
                 // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-                isManualPrint: true
               });
             case 16:
               return _context61.abrupt("return", response);
@@ -6370,7 +6367,7 @@ var Server = /*#__PURE__*/function () {
     value: function shouldAutoPrintCheckoutReceipt() {
       var _this$core$context2, _this$core$context2$g, _this$app17, _this$app17$getStorag;
       if (((_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 || (_this$core$context2$g = _this$core$context2.getPlatform) === null || _this$core$context2$g === void 0 ? void 0 : _this$core$context2$g.call(_this$core$context2)) !== 'android') return true;
-      return ((_this$app17 = this.app) === null || _this$app17 === void 0 || (_this$app17 = _this$app17.storage) === null || _this$app17 === void 0 || (_this$app17$getStorag = _this$app17.getStorage) === null || _this$app17$getStorag === void 0 ? void 0 : _this$app17$getStorag.call(_this$app17, AUTO_PRINT_STORAGE_KEY)) === 'true';
+      return ((_this$app17 = this.app) === null || _this$app17 === void 0 || (_this$app17 = _this$app17.storage) === null || _this$app17 === void 0 || (_this$app17$getStorag = _this$app17.getStorage) === null || _this$app17$getStorag === void 0 ? void 0 : _this$app17$getStorag.call(_this$app17, AUTO_PRINT_STORAGE_KEY)) !== 'false';
     }
   }, {
     key: "shouldBuildSmallTicketData",

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

@@ -283,6 +283,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;