@pisell/pisellos 2.2.276 → 2.2.278

package/dist/core/index.js

@@ -45,7 +45,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('constructor1234');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -257,7 +257,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
             var rawText = this.getText(reasonCode);
             // 金额类型字段：从 otherParams.getData 取货币符号；非金额或取不到则留空
             var currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 || (_this$otherParams$get = (_this$otherParams2 = _this$otherParams).getData) === null || _this$otherParams$get === void 0 ? void 0 : _this$otherParams$get.call(_this$otherParams2, 'shop_symbol')) || '' : '';
-            console.log(currency, 'currency12345');
             var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue, currency) : rawText;
             results.push({
               voucher: voucher,
@@ -506,7 +505,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -26,6 +26,11 @@ export interface Voucher {
     recommended_usage_amount: number;
     /** 后端计算推荐使用金额（仅商品） 不包含税费附加费 */
     recommended_pure_product_usage_amount: number;
+    /**
+     * 扫码资产自身可供前端重新计算的金额基准。
+     * 后端 recommended_usage_amount 会包含当前已选券上下文，取消勾选后不能继续把它当作资产永久上限。
+     */
+    _wallet_asset_recalculation_base_amount?: number;
     /** 实际抵扣金额 */
     actualDeduction: number;
     /** 抵扣详情 */

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -1,9 +1,4 @@
 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 _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; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 _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."); }
@@ -11,7 +6,25 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
+var DEFAULT_WALLET_PASS_CALCULATION_CONFIG = {
+  maxDeductionAmount: 99999,
+  maxUsagePerOrder: 0,
+  allowCrossProduct: true,
+  applicableProductLimit: 0,
+  deductTaxAndFee: true,
+  maxPassesPerItem: 0,
+  deductOptionPrice: false
+};
+function getWalletPassCalculationConfig(voucher) {
+  return _objectSpread(_objectSpread({}, DEFAULT_WALLET_PASS_CALCULATION_CONFIG), (voucher === null || voucher === void 0 ? void 0 : voucher.config) || {});
+}
+
 /** 订单商品数量 */
 export var getProductQuantity = function getProductQuantity(product) {
   return product.quantity || product.product_quantity || 1;
@@ -72,12 +85,22 @@ function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPer
 // 辅助函数：根据 deductTaxAndFee 配置获取推荐使用金额
 var getRecommendedAmount = function getRecommendedAmount(voucher) {
   var _config$deductTaxAndF;
-  console.log('voucher312', voucher);
   var config = voucher.config,
     recommended_usage_amount = voucher.recommended_usage_amount,
     recommended_pure_product_usage_amount = voucher.recommended_pure_product_usage_amount;
   var deductTaxAndFee = (_config$deductTaxAndF = config === null || config === void 0 ? void 0 : config.deductTaxAndFee) !== null && _config$deductTaxAndF !== void 0 ? _config$deductTaxAndF : true; // 默认开启抵扣税费
 
+  // 扫码接口的 recommended_* 金额包含搜索时已选券的上下文，可能只是当时的
+  // 剩余可抵扣额。取消其他券后，前端重算需要回到资产自身金额基准，再由
+  // 剩余订单金额、适用商品金额和策略上限重新裁剪。
+  var rawRecalculationBaseAmount = voucher._wallet_asset_recalculation_base_amount;
+  if (rawRecalculationBaseAmount !== undefined && rawRecalculationBaseAmount !== null) {
+    var recalculationBaseAmount = Number(rawRecalculationBaseAmount);
+    if (Number.isFinite(recalculationBaseAmount) && recalculationBaseAmount >= 0) {
+      return recalculationBaseAmount;
+    }
+  }
+
   // 如果开启抵扣税费，使用 recommended_usage_amount（包含税费）
   // 如果关闭抵扣税费，使用 recommended_pure_product_usage_amount（仅商品金额）
   return deductTaxAndFee ? recommended_usage_amount : recommended_pure_product_usage_amount !== null && recommended_pure_product_usage_amount !== void 0 ? recommended_pure_product_usage_amount : recommended_usage_amount;
@@ -166,8 +189,6 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
  * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
  */
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, 'products123');
-
   // 拆分商品数据，同时维护含税和不含税两个金额池
   // remainingAmountWithTax: 含税费的剩余可抵扣金额
   // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额
@@ -285,7 +306,6 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   // 辅助函数：判断券是否可用，返回可用性和原因代码
   var isVoucherAvailable = function isVoucherAvailable(voucher, productsData, usedVoucherCounts, itemPassUsage) {
     var config = voucher.config,
-      id = voucher.id,
       product_id = voucher.product_id;
 
     // 根据 deductTaxAndFee 配置获取推荐金额
@@ -659,6 +679,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   var productsForCalc = expandProductsWithBundleItems(products, true);
   var remainingOrderAmount = new Decimal(orderTotalAmount);
   var selectedWithDetails = [];
+  var usedVoucherCounts = new Map();
 
   // 追踪每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数（按行唯一键）
   var itemPassUsageMap = new Map();
@@ -678,15 +699,26 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
     var _selectedVoucher$_ava;
-    var config = selectedVoucher.config,
-      id = selectedVoucher.id;
+    var product_id = selectedVoucher.product_id;
+    var config = getWalletPassCalculationConfig(selectedVoucher);
     var maxDeductionAmount = config.maxDeductionAmount,
+      maxUsagePerOrder = config.maxUsagePerOrder,
       allowCrossProduct = config.allowCrossProduct,
       applicableProductLimit = config.applicableProductLimit,
-      _config$deductTaxAndF4 = config.deductTaxAndFee,
-      deductTaxAndFee = _config$deductTaxAndF4 === void 0 ? true : _config$deductTaxAndF4,
-      _config$maxPassesPerI = config.maxPassesPerItem,
-      maxPassesPerItem = _config$maxPassesPerI === void 0 ? 0 : _config$maxPassesPerI;
+      deductTaxAndFee = config.deductTaxAndFee,
+      maxPassesPerItem = config.maxPassesPerItem;
+    var usedCount = usedVoucherCounts.get(product_id) || 0;
+    if (maxUsagePerOrder > 0 && usedCount >= maxUsagePerOrder) {
+      selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
+        config: config,
+        actualDeduction: 0,
+        deductionDetails: [],
+        _available_max_amount: 0,
+        _unified_available_status: 0,
+        reasonCode: 'usage_limit_reached'
+      }));
+      return;
+    }
 
     // 根据券的配置选择使用哪个单价字段和金额字段
     var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
@@ -702,6 +734,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     if (applicableProducts.length === 0) {
       // 无适用商品，跳过
       selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
+        config: config,
         actualDeduction: 0,
         deductionDetails: [],
         _available_max_amount: 0,
@@ -798,6 +831,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
     applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
+      config: config,
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
       deductionDetails: deductionDetails,
@@ -805,16 +839,15 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       // 转换为数字
       _unified_available_status: totalDeducted.greaterThan(0) ? 1 : 0
     }));
+    if (totalDeducted.greaterThan(0)) {
+      usedVoucherCounts.set(product_id, usedCount + 1);
+    }
   });
 
   // 第二步：为所有券重新计算 _available_max_amount 和 _unified_available_status
   var selectedIds = new Set(selectedVouchers.map(function (v) {
     return v.id;
   }));
-  var usedVoucherCounts = new Map();
-  selectedVouchers.forEach(function (v) {
-    usedVoucherCounts.set(v.product_id, (usedVoucherCounts.get(v.product_id) || 0) + 1);
-  });
   var allWithUpdatedStatus = allVouchers.map(function (voucher) {
     // 如果是已选中的券，使用详细计算结果
     if (selectedIds.has(voucher.id)) {
@@ -825,16 +858,13 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     }
 
     // 未选中的券，重新计算其可用状态
-    var config = voucher.config,
-      id = voucher.id,
-      product_id = voucher.product_id;
+    var product_id = voucher.product_id;
+    var config = getWalletPassCalculationConfig(voucher);
     var maxDeductionAmount = config.maxDeductionAmount,
       allowCrossProduct = config.allowCrossProduct,
       applicableProductLimit = config.applicableProductLimit,
-      _config$deductTaxAndF5 = config.deductTaxAndFee,
-      deductTaxAndFee = _config$deductTaxAndF5 === void 0 ? true : _config$deductTaxAndF5,
-      _config$maxPassesPerI2 = config.maxPassesPerItem,
-      maxPassesPerItem = _config$maxPassesPerI2 === void 0 ? 0 : _config$maxPassesPerI2;
+      deductTaxAndFee = config.deductTaxAndFee,
+      maxPassesPerItem = config.maxPassesPerItem;
 
     // 根据券的配置选择使用哪个单价字段和金额字段
     var unitPriceField = deductTaxAndFee ? 'unitPriceWithTax' : 'unitPricePure';
@@ -929,6 +959,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       }
     }
     return _objectSpread(_objectSpread({}, voucher), {}, {
+      config: config,
       _available_max_amount: calculatedMaxAmount.toNumber(),
       // 转换为数字
       _unified_available_status: isAvailable ? 1 : 0

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

@@ -486,6 +486,8 @@ export interface WalletPassPayment {
     importWalletAssetsSnapshot: (snapshot: WalletAssetsSnapshot) => WalletAssetsState;
     /** 设置单张钱包资产的选择状态并重新计算其实际抵扣额。 */
     selectWalletAsset: (assetId: WalletAssetId, options: SelectWalletAssetOptions) => WalletAssetsState;
+    /** 更新已选钱包资产的手动使用金额，并保持原有选择顺序重新计算。 */
+    updateWalletAssetAmount: (assetId: WalletAssetId, amount: number) => WalletAssetsState;
     /** 精确搜索钱包资产；仅当前券可用时自动选择。 */
     scanWalletAssetAsync: (code: string) => Promise<ScanWalletAssetResult>;
     /** 清空未确认的钱包资产选择。 */

package/dist/modules/Payment/utils.js

@@ -12,9 +12,12 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
   var formatted = (list || []).map(function (item) {
+    var _ref, _item$actualDeduction;
     return {
       voucher_id: item.id || 0,
-      amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
+      // 前端策略重算后的 actualDeduction 才是最终可同步金额；
+      // edit_current_amount 只是用户请求值，仍可能被策略和订单剩余金额裁剪。
+      amount: Number((_ref = (_item$actualDeduction = item.actualDeduction) !== null && _item$actualDeduction !== void 0 ? _item$actualDeduction : item.edit_current_amount) !== null && _ref !== void 0 ? _ref : getAvailableMaxAmount(item)) || 0,
       tag: item.tag || '',
       wallet_pass_usage_unit: item.wallet_pass_usage_unit || {},
       wallet_pass_use_value: item.wallet_pass_use_value || undefined

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

@@ -24,6 +24,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private emitEvent;
     private publishWalletAssetsState;
     private recalculateWalletAssets;
+    /**
+     * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+     * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+     */
+    private formatSearchedWalletPaymentAssets;
     /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
     private getSearchedWalletAssetCodes;
     /**
@@ -106,7 +111,13 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     getWalletAssetsState(): WalletAssetsState;
     exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
     importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): WalletAssetsState;
+    private updateWalletAssetEditAmountInCaches;
     selectWalletAsset(assetId: WalletAssetId, options: SelectWalletAssetOptions): WalletAssetsState;
+    /**
+     * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+     * 金额为 0 时沿用 legacy 行为取消选择。
+     */
+    updateWalletAssetAmount(assetId: WalletAssetId, amount: number): WalletAssetsState;
     scanWalletAssetAsync(code: string): Promise<ScanWalletAssetResult>;
     clearWalletAssetSelection(): WalletAssetsState;
     setCommittedWalletAssets(committedIds: WalletAssetId[], committedAssets?: any[]): WalletAssetsState;