@pisell/pisellos 2.2.276 → 2.2.278

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; }
@@ -45,6 +45,29 @@ function normalizeWalletAssetCode(code) {
 function getWalletAssetCodeKeys(asset) {
   return [asset === null || asset === void 0 ? void 0 : asset.code, asset === null || asset === void 0 ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
 }
+
+/**
+ * 保存货币类扫码资产自身的可用余额，供后续前端策略重新计算。
+ * 搜索接口的 recommended_usage_amount 已扣除了搜索时的已选券，不能作为
+ * 取消勾选后的永久上限。积分卡的 balance_par_value 是积分值，不能直接
+ * 当作货币金额，因此继续沿用接口推荐金额。
+ */
+function withWalletAssetRecalculationBaseAmount(asset) {
+  var existingBaseAmount = Number(asset === null || asset === void 0 ? void 0 : asset._wallet_asset_recalculation_base_amount);
+  if (Number.isFinite(existingBaseAmount) && existingBaseAmount >= 0) {
+    return asset;
+  }
+  if (!['product_voucher', 'gift_card'].includes(asset === null || asset === void 0 ? void 0 : asset.tag)) {
+    return asset;
+  }
+  var balanceParValue = Number(asset === null || asset === void 0 ? void 0 : asset.balance_par_value);
+  if (!Number.isFinite(balanceParValue) || balanceParValue < 0) {
+    return asset;
+  }
+  return _objectSpread(_objectSpread({}, asset), {}, {
+    _wallet_asset_recalculation_base_amount: balanceParValue
+  });
+}
 function isWalletAssetAvailable(asset) {
   if (!asset) return false;
   if (asset.unified_available_status !== undefined && Number(asset.unified_available_status) !== 1) {
@@ -81,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',
@@ -228,6 +271,36 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       });
     }
 
+    /**
+     * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+     * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+     */
+  }, {
+    key: "formatSearchedWalletPaymentAssets",
+    value: function formatSearchedWalletPaymentAssets(assets) {
+      var _this$paymentModule$w3, _this$paymentModule$w4, _this$walletParams, _this$walletParams2;
+      if (!assets.length) return assets;
+      var assetsWithRecalculationBase = assets.map(withWalletAssetRecalculationBaseAmount);
+      var evaluator = (_this$paymentModule$w3 = this.paymentModule.window) === null || _this$paymentModule$w3 === void 0 || (_this$paymentModule$w4 = _this$paymentModule$w3.getWalletPassEvaluator) === null || _this$paymentModule$w4 === void 0 ? void 0 : _this$paymentModule$w4.call(_this$paymentModule$w3);
+      if (!(evaluator !== null && evaluator !== void 0 && evaluator.searchVoucherFormat)) return assetsWithRecalculationBase;
+      var hasCalculationProducts = this.walletAssetsCalculationContext.products.length > 0;
+      var products = hasCalculationProducts ? this.walletAssetsCalculationContext.products : ((_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.products) || [];
+      var orderTotalAmount = Number(hasCalculationProducts ? this.walletAssetsCalculationContext.orderTotalAmount : ((_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.order_wait_pay_amount) || 0);
+      try {
+        var formattedAssets = evaluator.searchVoucherFormat({
+          orderTotalAmount: orderTotalAmount,
+          products: products,
+          vouchers: assetsWithRecalculationBase
+        });
+        return formattedAssets;
+      } catch (error) {
+        this.paymentModule.logWarning('[WalletPass] 搜索资产策略格式化失败，保留接口结果', {
+          error: error instanceof Error ? error.message : String(error)
+        });
+        return assetsWithRecalculationBase;
+      }
+    }
+
     /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
   }, {
     key: "getSearchedWalletAssetCodes",
@@ -256,8 +329,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         return code.toUpperCase();
       }));
       if (searchedCodeKeys.size === 0) return cachedAssets;
+      var cachedAssetByCode = new Map();
+      cachedAssets.forEach(function (item) {
+        getWalletAssetCodeKeys(item).forEach(function (code) {
+          cachedAssetByCode.set(code, item);
+        });
+      });
       var refreshedAssets = refreshedCandidates.filter(function (item) {
         return isWalletPaymentAsset(item) && searchedCodeKeys.has(String((item === null || item === void 0 ? void 0 : item.code) || '').trim().toUpperCase());
+      }).map(function (item) {
+        var cachedAsset = getWalletAssetCodeKeys(item).map(function (code) {
+          return cachedAssetByCode.get(code);
+        }).find(Boolean);
+        return withWalletAssetRecalculationBaseAmount(_objectSpread(_objectSpread({}, cachedAsset), item));
       });
       if (refreshedAssets.length > 0) {
         var replacedCodes = new Set(refreshedAssets.map(function (item) {
@@ -333,8 +417,14 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         payment_order_id: payment_order_id
       };
 
-      // 存储生成的参数到模块中
+      // 扫码可能早于异步 Wallet 初始化完成。walletParams 与前端增量重算
+      // 必须使用同一份当前购物车上下文，避免搜索按真实金额判断可用，
+      // 随后的 recalculateVouchers 却仍读取初始的 0 元/空商品上下文。
       this.walletParams = walletParams;
+      this.walletAssetsCalculationContext = {
+        orderTotalAmount: Number(walletParams.order_wait_pay_amount || 0),
+        products: Array.isArray(walletParams.products) ? walletParams.products : []
+      };
       this.paymentModule.logInfo('[WalletPass] 钱包默认参数已生成并存储', {
         customer_id: walletParams.customer_id,
         holder_id: walletParams.holder_id,
@@ -511,7 +601,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "initializeWalletDataAsync",
     value: (function () {
       var _initializeWalletDataAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(baseParams) {
-        var _this$paymentModule$w3, _this$paymentModule$w4, identificationParams, _yield$Promise$all, _yield$Promise$all2, allList, orderBasicDetail, walletPassEvaluator, products, res, recommended, transformList, noApplicableVoucher, recommendedAmount;
+        var _this$paymentModule$w5, _this$paymentModule$w6, identificationParams, _yield$Promise$all, _yield$Promise$all2, allList, orderBasicDetail, walletPassEvaluator, products, res, recommended, transformList, noApplicableVoucher, recommendedAmount;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -530,7 +620,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               allList = _yield$Promise$all2[0];
               orderBasicDetail = _yield$Promise$all2[1];
-              walletPassEvaluator = (_this$paymentModule$w3 = this.paymentModule.window) === null || _this$paymentModule$w3 === void 0 || (_this$paymentModule$w4 = _this$paymentModule$w3.getWalletPassEvaluator) === null || _this$paymentModule$w4 === void 0 ? void 0 : _this$paymentModule$w4.call(_this$paymentModule$w3);
+              walletPassEvaluator = (_this$paymentModule$w5 = this.paymentModule.window) === null || _this$paymentModule$w5 === void 0 || (_this$paymentModule$w6 = _this$paymentModule$w5.getWalletPassEvaluator) === null || _this$paymentModule$w6 === void 0 ? void 0 : _this$paymentModule$w6.call(_this$paymentModule$w5);
               if (walletPassEvaluator) {
                 _context3.next = 11;
                 break;
@@ -550,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 使用
@@ -570,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);
@@ -598,8 +687,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "aggregateRecalculateWalletAssetsAsync",
     value: (function () {
       var _aggregateRecalculateWalletAssetsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(businessData, selectedIds) {
-        var _this$paymentModule$w5, _this$paymentModule$w6;
-        var walletParams, customerId, requestParams, response, responseData, hasAggregateLists, recalculateList, customerWalletPassList, allList, walletPassEvaluator, evaluated, returnedSelectedKeys, authoritativeSelectedIds;
+        var _this$paymentModule$w7, _this$paymentModule$w8;
+        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:
@@ -635,8 +724,9 @@ 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);
-              walletPassEvaluator = (_this$paymentModule$w5 = this.paymentModule.window) === null || _this$paymentModule$w5 === void 0 || (_this$paymentModule$w6 = _this$paymentModule$w5.getWalletPassEvaluator) === null || _this$paymentModule$w6 === void 0 ? void 0 : _this$paymentModule$w6.call(_this$paymentModule$w5);
+              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,
                 products: walletParams.products,
@@ -647,8 +737,10 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 noApplicableVoucher: allList.filter(function (item) {
                   return !isWalletAssetAvailable(item);
                 })
-              };
-              returnedSelectedKeys = new Set(recalculateList.filter(isWalletAssetAvailable).map(function (item) {
+              }; // 聚合接口只负责刷新资产数据；选中资格最终由前端 evaluator 重算。
+              // 这里仅移除接口完全未返回的资产，不能把 recalculate_list 当作
+              // 策略选中结果，否则 customer_wallet_pass_list 中的可用券会被误取消。
+              returnedSelectedKeys = new Set(allList.map(function (item) {
                 return getWalletAssetKey(item);
               }));
               authoritativeSelectedIds = selectedIds.filter(function (id) {
@@ -677,7 +769,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 products: walletParams.products || [],
                 authoritativeSelectedIds: authoritativeSelectedIds
               });
-            case 24:
+            case 25:
             case "end":
               return _context4.stop();
           }
@@ -692,7 +784,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getWalletPassRecommendListAsync",
     value: function () {
       var _getWalletPassRecommendListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var _this$walletParams, response;
+        var _this$walletParams3, response;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -701,7 +793,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 customer_id: params.customer_id,
                 order_expect_amount: params.order_expect_amount,
                 sale_channel: params.sale_channel,
-                payment_order_id: (_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.payment_order_id
+                payment_order_id: (_this$walletParams3 = this.walletParams) === null || _this$walletParams3 === void 0 ? void 0 : _this$walletParams3.payment_order_id
               });
               if (typeof params.payment_order_id === 'string' && params.payment_order_id.startsWith('LOCAL_')) {
                 params.payment_order_id = undefined;
@@ -759,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$walletParams2, newParams, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -780,7 +872,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 available: newParams.available,
                 prepare_payments_count: ((_newParams$prepare_pa = newParams.prepare_payments) === null || _newParams$prepare_pa === void 0 ? void 0 : _newParams$prepare_pa.length) || 0,
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
-                payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
+                payment_order_id: (_this$walletParams4 = this.walletParams) === null || _this$walletParams4 === void 0 ? void 0 : _this$walletParams4.payment_order_id
               });
               _context6.next = 9;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
@@ -1019,6 +1111,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
           selectedIds,
           selectionSources,
           scanSelectedAssets,
+          manualEditAmountByKey,
           restoredSearchedAssets,
           searchedWalletAssetCodes,
           useAggregateRecalculate,
@@ -1061,11 +1154,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               scanSelectedAssets = preserveSelection ? this.walletAssetsState.selectedItems.filter(function (asset) {
                 var assetId = getWalletAssetId(asset);
                 return assetId !== undefined && assetId !== null && selectionSources[String(assetId)] === 'scan';
-              }) : []; // aggregate-recalculate 不接受空商品列表。
+              }) : [];
+              manualEditAmountByKey = new Map();
+              if (preserveSelection) {
+                this.walletAssetsState.selectedItems.forEach(function (asset) {
+                  if (typeof (asset === null || asset === void 0 ? void 0 : asset.edit_current_amount) !== 'number') return;
+                  manualEditAmountByKey.set(getWalletAssetKey(asset), asset.edit_current_amount);
+                });
+              }
+
+              // aggregate-recalculate 不接受空商品列表。
               // 清空购物车时保留扫码资产供后续加购恢复；只有手动 Remove/Clear
               // 会取消自动应用资格，商品变化导致的自动失效需要重新进入待选队列。
               if ((_businessData$product2 = businessData.products) !== null && _businessData$product2 !== void 0 && _businessData$product2.length) {
-                _context8.next = 22;
+                _context8.next = 24;
                 break;
               }
               this.queuePendingAutoSelectForAssets(scanSelectedAssets);
@@ -1103,7 +1205,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 totalSelectedAmount: 0,
                 error: null
               }));
-            case 22:
+            case 24:
               this.publishWalletAssetsState({
                 status: 'loading',
                 customerId: nextCustomerId,
@@ -1114,40 +1216,40 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 totalSelectedAmount: preserveSelection ? this.walletAssetsState.totalSelectedAmount : 0,
                 error: null
               });
-              _context8.prev = 23;
+              _context8.prev = 25;
               searchedWalletAssetCodes = preserveSelection ? this.getSearchedWalletAssetCodes() : [];
               useAggregateRecalculate = preserveSelection && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
               if (!useAggregateRecalculate) {
-                _context8.next = 32;
+                _context8.next = 34;
                 break;
               }
-              _context8.next = 29;
+              _context8.next = 31;
               return this.aggregateRecalculateWalletAssetsAsync(businessData, selectedIds);
-            case 29:
+            case 31:
               _context8.t0 = _context8.sent;
-              _context8.next = 33;
+              _context8.next = 35;
               break;
-            case 32:
+            case 34:
               _context8.t0 = null;
-            case 33:
+            case 35:
               aggregateResult = _context8.t0;
               _context8.t1 = aggregateResult;
               if (_context8.t1) {
-                _context8.next = 39;
+                _context8.next = 41;
                 break;
               }
-              _context8.next = 38;
+              _context8.next = 40;
               return this.initializeWalletDataFromBusinessAsync(businessData);
-            case 38:
+            case 40:
               _context8.t1 = _context8.sent;
-            case 39:
+            case 41:
               result = _context8.t1;
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 42;
+                _context8.next = 44;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 42:
+            case 44:
               this.walletAssetsCalculationContext = {
                 orderTotalAmount: Number(businessData.order_wait_pay_amount || 0),
                 products: result.products || businessData.products || []
@@ -1170,17 +1272,20 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               }
               searchedWalletAssets = preserveSelection ? this.syncSearchedWalletAssets([].concat(_toConsumableArray(result.transformList || []), _toConsumableArray(result.noApplicableVoucher || []))) : [];
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 48;
+                _context8.next = 50;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 48:
+            case 50:
               recommendedKeys = new Set((result.walletRecommendList || []).map(function (asset) {
                 return getWalletAssetKey(asset);
               }));
               items = mergeWalletAssets(preserveSelection && !aggregateResult ? this.walletAssetsState.selectedItems : [], searchedWalletAssets, result.transformList || [], result.noApplicableVoucher || []).map(function (asset) {
-                return _objectSpread(_objectSpread({}, asset), {}, {
-                  _wallet_asset_recommended: recommendedKeys.has(getWalletAssetKey(asset))
+                var assetKey = getWalletAssetKey(asset);
+                return _objectSpread(_objectSpread(_objectSpread({}, asset), manualEditAmountByKey.has(assetKey) ? {
+                  edit_current_amount: manualEditAmountByKey.get(assetKey)
+                } : {}), {}, {
+                  _wallet_asset_recommended: recommendedKeys.has(assetKey)
                 });
               });
               latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
@@ -1217,15 +1322,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
               this.queuePendingAutoSelectForAssets(droppedScanSelectedAssets);
               return _context8.abrupt("return", nextState);
-            case 63:
-              _context8.prev = 63;
-              _context8.t2 = _context8["catch"](23);
+            case 65:
+              _context8.prev = 65;
+              _context8.t2 = _context8["catch"](25);
               if (!(requestSequence !== this.walletAssetsRequestSequence)) {
-                _context8.next = 67;
+                _context8.next = 69;
                 break;
               }
               return _context8.abrupt("return", this.getWalletAssetsState());
-            case 67:
+            case 69:
               this.paymentModule.logError('[WalletPass] 刷新共享钱包资产失败，保留刷新前状态', _context8.t2, {
                 customer_id: businessData.customer_id,
                 selected_ids: selectedIds,
@@ -1241,11 +1346,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 customerId: nextCustomerId,
                 error: _context8.t2 instanceof Error ? _context8.t2.message : String(_context8.t2)
               }));
-            case 69:
+            case 71:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[23, 63]]);
+        }, _callee8, this, [[25, 65]]);
       }));
       function refreshWalletAssetsFromBusinessAsync(_x9) {
         return _refreshWalletAssetsFromBusinessAsync.apply(this, arguments);
@@ -1298,6 +1403,17 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         selectionSources: snapshot.state.selectionSources || {}
       }));
     }
+  }, {
+    key: "updateWalletAssetEditAmountInCaches",
+    value: function updateWalletAssetEditAmountInCaches(assetKey, amount) {
+      var updateAsset = function updateAsset(asset) {
+        return getWalletAssetKey(asset) === assetKey ? _objectSpread(_objectSpread({}, asset), {}, {
+          edit_current_amount: amount
+        }) : asset;
+      };
+      this.searchResults = this.searchResults.map(updateAsset);
+      return this.walletAssetsState.items.map(updateAsset);
+    }
   }, {
     key: "selectWalletAsset",
     value: function selectWalletAsset(assetId, options) {
@@ -1314,6 +1430,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       });
       var selectionSources = _objectSpread({}, this.walletAssetsState.selectionSources);
       delete selectionSources[assetKey];
+      var nextItems = this.walletAssetsState.items;
       if (options.selected) {
         if (!asset || !isWalletAssetAvailable(asset)) {
           return this.getWalletAssetsState();
@@ -1322,8 +1439,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         selectionSources[assetKey] = options.source || 'manual';
       } else if (asset) {
         this.clearPendingAutoSelectForAsset(asset);
+        nextItems = this.updateWalletAssetEditAmountInCaches(assetKey, undefined);
       }
-      var nextState = this.recalculateWalletAssets(this.walletAssetsState.items, selectedIds, selectionSources);
+      var nextState = this.recalculateWalletAssets(nextItems, selectedIds, selectionSources);
       if (options.selected && asset && nextState.selectedIds.some(function (id) {
         return String(id) === assetKey;
       })) {
@@ -1331,11 +1449,49 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       }
       return nextState;
     }
+
+    /**
+     * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+     * 金额为 0 时沿用 legacy 行为取消选择。
+     */
+  }, {
+    key: "updateWalletAssetAmount",
+    value: function updateWalletAssetAmount(assetId, amount) {
+      var assetKey = String(assetId);
+      var committedKeys = new Set(this.walletAssetsState.committedIds.map(function (id) {
+        return String(id);
+      }));
+      var selectedKeys = new Set(this.walletAssetsState.selectedIds.map(function (id) {
+        return String(id);
+      }));
+      var asset = this.walletAssetsState.items.find(function (item) {
+        return getWalletAssetKey(item) === assetKey;
+      });
+      var requestedAmount = Number(amount);
+      if (!asset || committedKeys.has(assetKey) || !selectedKeys.has(assetKey) || !Number.isFinite(requestedAmount) || requestedAmount < 0) {
+        return this.getWalletAssetsState();
+      }
+      var selectedIds = _toConsumableArray(this.walletAssetsState.selectedIds);
+      var selectionSources = _objectSpread({}, this.walletAssetsState.selectionSources);
+      if (requestedAmount === 0) {
+        var _nextItems = this.updateWalletAssetEditAmountInCaches(assetKey, undefined);
+        delete selectionSources[assetKey];
+        this.clearPendingAutoSelectForAsset(asset);
+        return this.recalculateWalletAssets(_nextItems, selectedIds.filter(function (id) {
+          return String(id) !== assetKey;
+        }), selectionSources);
+      }
+      var currentDeductionAmount = getWalletAssetDeductionAmount(asset);
+      var editAmount = Math.min(requestedAmount, currentDeductionAmount);
+      if (editAmount <= 0) return this.getWalletAssetsState();
+      var nextItems = this.updateWalletAssetEditAmountInCaches(assetKey, editAmount);
+      return this.recalculateWalletAssets(nextItems, selectedIds, selectionSources);
+    }
   }, {
     key: "scanWalletAssetAsync",
     value: function () {
       var _scanWalletAssetAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(code) {
-        var normalizedCode, selectedAsset, result, paymentAssets, asset, items, recalculatedState, assetId, selected, isSelected;
+        var normalizedCode, selectedAsset, result, paymentAssets, asset, items, recalculatedState, assetId, recalculatedAsset, selected, isSelected, selectedStateAsset, resolvedAsset;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -1372,12 +1528,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               }));
             case 9:
               result = _context9.sent;
-              paymentAssets = result.data.filter(isWalletPaymentAsset);
+              paymentAssets = this.formatSearchedWalletPaymentAssets(result.data.filter(isWalletPaymentAsset));
+              if (paymentAssets.length > 0) {
+                this.searchResults = mergeWalletAssets(this.searchResults, paymentAssets);
+              }
               asset = paymentAssets.find(function (item) {
                 return String((item === null || item === void 0 ? void 0 : item.code) || '') === normalizedCode;
               }) || paymentAssets[0];
               if (!(!asset || result.type === 'walletCode')) {
-                _context9.next = 14;
+                _context9.next = 15;
                 break;
               }
               return _context9.abrupt("return", {
@@ -1386,30 +1545,37 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 selected: false,
                 state: this.getWalletAssetsState()
               });
-            case 14:
+            case 15:
               items = mergeWalletAssets(this.walletAssetsState.items, [asset]);
               recalculatedState = this.recalculateWalletAssets(items, this.walletAssetsState.selectedIds, this.walletAssetsState.selectionSources);
               assetId = getWalletAssetId(asset);
-              selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== undefined && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+              recalculatedAsset = assetId === undefined ? undefined : recalculatedState.items.find(function (item) {
+                return getWalletAssetKey(item) === String(assetId);
+              });
+              selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== undefined && isWalletAssetAvailable(recalculatedAsset) ? this.selectWalletAsset(assetId, {
                 selected: true,
                 source: 'scan'
               }) : recalculatedState;
               isSelected = assetId !== undefined && selected.selectedIds.some(function (id) {
                 return String(id) === String(assetId);
               });
+              selectedStateAsset = assetId === undefined ? undefined : selected.items.find(function (item) {
+                return getWalletAssetKey(item) === String(assetId);
+              });
+              resolvedAsset = selectedStateAsset || recalculatedAsset || asset;
               if (isSelected) {
-                this.clearPendingAutoSelectForAsset(asset);
+                this.clearPendingAutoSelectForAsset(resolvedAsset);
               } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
                 this.pendingAutoSelectSearchCodes.add(normalizeWalletAssetCode(normalizedCode));
-                this.queuePendingAutoSelectForAssets([asset]);
+                this.queuePendingAutoSelectForAssets([resolvedAsset]);
               }
               return _context9.abrupt("return", {
                 type: result.type,
-                asset: asset,
+                asset: resolvedAsset,
                 selected: isSelected,
                 state: selected
               });
-            case 21:
+            case 25:
             case "end":
               return _context9.stop();
           }
@@ -1424,7 +1590,16 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "clearWalletAssetSelection",
     value: function clearWalletAssetSelection() {
       this.pendingAutoSelectSearchCodes.clear();
-      return this.recalculateWalletAssets(this.walletAssetsState.items, [], {});
+      var selectedKeys = new Set(this.walletAssetsState.selectedIds.map(function (id) {
+        return String(id);
+      }));
+      var clearSelectedEditAmount = function clearSelectedEditAmount(asset) {
+        return selectedKeys.has(getWalletAssetKey(asset)) ? _objectSpread(_objectSpread({}, asset), {}, {
+          edit_current_amount: undefined
+        }) : asset;
+      };
+      this.searchResults = this.searchResults.map(clearSelectedEditAmount);
+      return this.recalculateWalletAssets(this.walletAssetsState.items.map(clearSelectedEditAmount), [], {});
     }
   }, {
     key: "setCommittedWalletAssets",

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

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

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

@@ -355,6 +355,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         selected: boolean;
         source?: WalletAssetSelectionSource;
     }): Promise<WalletAssetsState>;
+    /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
+    updateWalletAssetAmount(params: {
+        assetId: WalletAssetId;
+        amount: number;
+    }): Promise<WalletAssetsState>;
     /** 扫码精确查券；仅可用资产会被自动选中。 */
     scanWalletAsset(code: string): Promise<ScanWalletAssetResult>;
     /** 清空全部未确认钱包选择，已支付钱包项由 Order 模块继续保留。 */