@pisell/pisellos 0.10.44 → 0.10.45

package/dist/solution/ShopDiscount/index.js

@@ -30,6 +30,7 @@ import { RulesModule } from "../../modules/Rules";
 import { isEntitlementPass } from "../../modules/Discount/entitlementPass";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
 import { UnavailableReason } from "../../modules/Rules/types";
+import { getDiscountLifecycleReason } from "../../modules/Discount/availability";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -441,7 +442,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
-        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, evaluatedDiscountList, isAvailable, unavailableReason, isAccepted, _this$options$otherPa6, scannedIds, retainedScannedDiscounts, _this$store$discount5, retainedDiscounts;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -523,30 +524,65 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, evaluatedDiscountList = _ref2.evaluatedDiscountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              isAccepted = isAvailable;
               if (!isAvailable) {
-                _context6.next = 25;
+                _context6.next = 28;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
-                _context6.next = 25;
+                _context6.next = 26;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 26;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 25:
+            case 26:
+              _context6.next = 38;
+              break;
+            case 28:
+              scannedIds = new Set(withScanList.map(function (discount) {
+                return String(discount.id);
+              }));
+              retainedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(function (discount) {
+                return scannedIds.has(String(discount.id)) && !getDiscountLifecycleReason(discount);
+              });
+              if (!retainedScannedDiscounts.length) {
+                _context6.next = 38;
+                break;
+              }
+              retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              retainedScannedDiscounts.forEach(function (discount) {
+                retainedDiscounts.set(String(discount.id), _objectSpread(_objectSpread({}, discount), {}, {
+                  isScan: true,
+                  isAvailable: false,
+                  isSelected: false,
+                  reasonCode: discount.reasonCode || 'product_not_applicable',
+                  appliedProductDetails: [],
+                  savedAmount: 0
+                }));
+              });
+              this.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
+              this.store.originalDiscountList = this.getDiscountList();
+              _context6.next = 37;
+              return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.setOriginalDiscountList(this.getDiscountList());
+            case 37:
+              isAccepted = true;
+            case 38:
               return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
+                isAccepted: Boolean(isAccepted),
                 productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList(),
+                discountList: this.getDiscountList(),
                 unavailableReason: unavailableReason
               });
-            case 28:
-              _context6.prev = 28;
+            case 41:
+              _context6.prev = 41;
               _context6.t1 = _context6["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context6.t1);
               return _context6.abrupt("return", {
@@ -556,11 +592,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 32:
+            case 45:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 28]]);
+        }, _callee6, this, [[0, 41]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
@@ -570,8 +606,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
-      var _this$store$discount5;
-      return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
+      var _this$store$discount6;
+      return (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.calcDiscountApplicableProductTotalPrice(discount);
     }
 
     // =========== 私有辅助方法 ===========
@@ -616,7 +652,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
       var _this3 = this,
-        _this$store$discount6;
+        _this$store$discount7;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
@@ -699,7 +735,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           item.isDisabledForProductUsed = false;
         }
       });
-      (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
+      (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
     }
@@ -708,8 +744,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount7;
-      return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
+      var _this$store$discount8;
+      return ((_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.getDiscountList()) || [];
     }
 
     // 获取客户钱包信息
@@ -791,7 +827,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount9, _this$getDiscountList, _this$store$discount10, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -801,13 +837,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               //   return
               // }
               _context10.next = 5;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
+              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
                 action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 with_entitlement_pass: 1,
+                filter_order_wallet_pass_usage: 0,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
@@ -844,10 +881,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
               _context10.next = 16;
-              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
+              return (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setOriginalDiscountList(newDiscountList);
             case 16:
-              // 根据当前预约时间过滤优惠券列表
-              filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+              // 日程限制交给 Rules 计算可用状态，展示列表保留当前不可用的卡券。
+              filteredDiscountList = newDiscountList;
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {

package/dist/solution/ShopDiscount/utils.d.ts

@@ -59,12 +59,14 @@ export interface ScheduleItem {
 }
 export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣

package/dist/solution/ShopDiscount/utils.js

@@ -9,7 +9,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 import Decimal from "decimal.js";
 import dayjs from "dayjs";
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import { isFullCoveragePass } from "../../modules/Discount/entitlementPass";
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
@@ -440,36 +444,51 @@ var isInWeeklyRepeatForDate = function isInWeeklyRepeatForDate(targetDate, start
 };
 
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 export var filterDiscountListByBookingTime = function filterDiscountListByBookingTime(discountList, bookingTime) {
-  if (!bookingTime) {
-    return discountList;
-  }
+  if (!bookingTime) return discountList;
   return discountList.filter(function (discount) {
-    var _discount$metadata2;
+    return !getDiscountTimeUnavailableReason(discount, bookingTime);
+  });
+};
+
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+export var getDiscountTimeUnavailableReason = function getDiscountTimeUnavailableReason(discount, useTime) {
+  var useTimeDayjs = dayjs(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
+    var _discount$metadata2, _discount$extension_d, _discount$custom_sche2;
     if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
       var _discount$custom_sche;
-      return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
+      return getDateIsInSchedule(useTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []) ? undefined : 'outside_schedule';
     }
-    try {
-      var isHasStart = !!discount.start_date && !!discount.start_time;
-      var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
-      var bookingTimeDayjs = dayjs(bookingTime);
-
-      // 判断预约时间是否在开始时间之后
-      var isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
-
-      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
-      var isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore(dayjs(discount.expire_time)) : true;
-      return isAfterStart && isBeforeExpire;
-    } catch (error) {
-      return true;
+    var isHasStart = !!discount.start_date && !!discount.start_time;
+    var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
     }
-  });
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    var expireTime = discount.expire_time ? dayjs(discount.expire_time) : null;
+    var isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    var validity = (_discount$extension_d = discount.extension_data) === null || _discount$extension_d === void 0 || (_discount$extension_d = _discount$extension_d.find(function (field) {
+      return field.field_key === 'valid_times';
+    })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value;
+    if ((validity === null || validity === void 0 ? void 0 : validity.restrict_use_by_schedule) === true && !getDateIsInSchedule(useTime, ((_discount$custom_sche2 = discount.custom_schedule_snapshot) === null || _discount$custom_sche2 === void 0 ? void 0 : _discount$custom_sche2.data) || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
 };
 /**
  * 判断是否是订单级别的固定金额折扣卡

package/lib/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -28,6 +28,8 @@ export declare class WalletPassEvaluator {
     /** 检查代金券/折扣卡是否可用 并返回config */
     checkVoucherAvailability(input: EvaluatorInput): {
         isAvailable: boolean;
+        reason: string | undefined;
+        reasonCode: string | undefined;
         config: {
             [x: string]: any;
         };

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

@@ -256,6 +256,8 @@ class WalletPassEvaluator {
     const isAvailable = results[0]?.isApplicable || false;
     return {
       isAvailable,
+      reason: results[0]?.reason,
+      reasonCode: results[0]?.reasonCode,
       config: {
         ...results[0]?.strategyResult?.config?.metadata?.custom
       }

package/lib/modules/Customer/index.js

@@ -150,6 +150,7 @@ class CustomerModule extends _BaseModule.BaseModule {
       with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord'],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
+      filter_franchisor_permissions: ['use'],
       ...(search && {
         search
       }),

package/lib/modules/Discount/availability.d.ts

@@ -0,0 +1,7 @@
+import type { Discount, DiscountFilterRejectKey } from './types';
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+export declare function getDiscountUsageLimitFailKey(discount: Discount): DiscountFilterRejectKey | null;
+export declare function hasAvailableDiscountBalance(discount: Discount): boolean;
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+export declare function getDiscountLifecycleReason(discount: Discount): 'disabled' | 'exhausted' | 'expired' | undefined;
+export declare function getDiscountUsageBlockReason(discount: Discount): string | undefined;

package/lib/modules/Discount/availability.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDiscountLifecycleReason = getDiscountLifecycleReason;
+exports.getDiscountUsageBlockReason = getDiscountUsageBlockReason;
+exports.getDiscountUsageLimitFailKey = getDiscountUsageLimitFailKey;
+exports.hasAvailableDiscountBalance = hasAvailableDiscountBalance;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _decimal = _interopRequireDefault(require("decimal.js"));
+var _entitlementPass = require("./entitlementPass");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** 周期限制只影响当前使用；total_credits 才代表整张卡的次数耗尽。 */
+function getDiscountUsageLimitFailKey(discount) {
+  const value = discount.extension_data?.find(field => field.field_key === 'usage_credits')?.value;
+  if (!value) return null;
+  const limits = [['total_credits', discount.total_order_behavior_count], ['per_user_limit', discount.customer_order_behavior_count], ['max_per_day', discount.today_order_behavior_count], ['max_per_week', discount.week_order_behavior_count], ['max_per_month', discount.month_order_behavior_count]];
+  return limits.find(([key, count]) => Number(value[key]) > 0 && Number(count || 0) >= Number(value[key]))?.[0] || null;
+}
+function hasAvailableDiscountBalance(discount) {
+  if ((0, _entitlementPass.isEntitlementPass)(discount)) return (0, _entitlementPass.hasAvailableEntitlementUses)(discount);
+  return new _decimal.default(discount.par_value || 0).minus(discount.used_par_value || 0).greaterThan(0);
+}
+
+/** 按卡本身当前生命周期判断；预约时间或一次日程不匹配不代表已失效。 */
+function getDiscountLifecycleReason(discount) {
+  if (discount.limit_status && discount.limit_status !== 'enable') {
+    return 'disabled';
+  }
+  if (((0, _entitlementPass.isEntitlementPass)(discount) || discount.par_value != null) && !hasAvailableDiscountBalance(discount) || getDiscountUsageLimitFailKey(discount) === 'total_credits') {
+    return 'exhausted';
+  }
+  // 自定义日程沿用快照语义，不使用遗留固定有效期字段推断过期。
+  if (discount.metadata?.validity_type !== 'custom_schedule_validity' && discount.expire_time) {
+    const expiry = (0, _dayjs.default)(discount.expire_time);
+    if (expiry.isValid() && !(0, _dayjs.default)().isBefore(expiry)) return 'expired';
+  }
+  return undefined;
+}
+function getDiscountUsageBlockReason(discount) {
+  return getDiscountLifecycleReason(discount) || getDiscountUsageLimitFailKey(discount) || (discount.unified_available_status != null && String(discount.unified_available_status) !== '' && Number(discount.unified_available_status) === 0 ? 'server_unavailable' : undefined);
+}

package/lib/modules/Discount/index.d.ts

@@ -27,6 +27,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_pass_flag?: 0 | 1;
         with_virtual_currency?: 0 | 1;
         with_entitlement_pass?: 0 | 1;
+        filter_order_wallet_pass_usage?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
@@ -37,10 +38,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     }): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
-    private hasAvailableBalance;
-    private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
-    private checkUsageCreditsLimitWithFailKey;
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;

package/lib/modules/Discount/index.js

@@ -8,7 +8,7 @@ var _utils = require("../../solution/ShopDiscount/utils");
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 var _decimal = _interopRequireDefault(require("decimal.js"));
-var _entitlementPass = require("./entitlementPass");
+var _availability = require("./availability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class DiscountModule extends _BaseModule.BaseModule {
   defaultName = 'discount';
@@ -170,143 +170,22 @@ class DiscountModule extends _BaseModule.BaseModule {
     });
     return result?.data || [];
   }
-  filterEnabledDiscountList(discountList) {
-    return discountList.filter(discount => discount.limit_status === 'enable' && this.hasAvailableBalance(discount) && this.checkUsageCreditsLimit(discount));
-  }
-  hasAvailableBalance(discount) {
-    if ((0, _entitlementPass.isEntitlementPass)(discount)) {
-      return (0, _entitlementPass.hasAvailableEntitlementUses)(discount);
-    }
-
-    // good_pass 与折扣卡继续沿用原有金额余额判断。
-    return new _decimal.default(discount?.par_value || 0).minus(new _decimal.default(discount?.used_par_value || 0)).greaterThan(0);
-  }
-
-  // 检查使用次数限制
-  checkUsageCreditsLimit(discount) {
-    // 如果没有 extension_data，则不需要限制
-    if (!discount.extension_data || discount.extension_data.length === 0) {
-      return true;
-    }
-
-    // 查找 field_key 为 usage_credits 的数据
-    const usageCreditsData = discount.extension_data.find(data => data.field_key === 'usage_credits');
-
-    // 如果没有找到 usage_credits 数据，则不需要限制
-    if (!usageCreditsData) {
-      return true;
-    }
-    const value = usageCreditsData.value;
-
-    // 检查总次数限制
-    if (value.total_credits && value.total_credits > 0) {
-      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-        return false;
-      }
-    }
-
-    // 检查单用户限制
-    if (value.per_user_limit && value.per_user_limit > 0) {
-      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-        return false;
-      }
-    }
-
-    // 检查单日限制
-    if (value.max_per_day && value.max_per_day > 0) {
-      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-        return false;
-      }
-    }
-
-    // 检查单周限制
-    if (value.max_per_week && value.max_per_week > 0) {
-      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-        return false;
-      }
-    }
-
-    // 检查单月限制
-    if (value.max_per_month && value.max_per_month > 0) {
-      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-        return false;
-      }
-    }
 
-    // 所有检查都通过
-    return true;
+  // 展示列表只剔除已失效项，当前不可用项保留并携带原因。
+  filterEnabledDiscountList(discountList) {
+    return discountList.filter(discount => discount.limit_status === 'enable' && (0, _availability.hasAvailableDiscountBalance)(discount) && !(0, _availability.getDiscountLifecycleReason)(discount)).map(discount => ({
+      ...discount,
+      usageLimitFailKey: (0, _availability.getDiscountUsageLimitFailKey)(discount),
+      reasonCode: (0, _availability.getDiscountUsageBlockReason)(discount)
+    }));
   }
-
-  // 过滤启用且可用的优惠券，并返回校验失败原因
   filterEnabledDiscountListWithReason(discountList) {
-    let lists = discountList.filter(discount => discount.limit_status === 'enable').filter(discount => this.hasAvailableBalance(discount)).map(discount => {
-      const limitFailKey = this.checkUsageCreditsLimitWithFailKey(discount);
-      return {
-        ...discount,
-        usageLimitFailKey: limitFailKey
-      };
-    });
-
-    // 可用的列表
-    const availableLists = lists.filter(item => !item.usageLimitFailKey && item.unified_available_status !== 0);
-    // 不可用数据
-    const currentFailDiscount = lists.find(item => item.usageLimitFailKey);
     return {
-      discountList: availableLists,
-      unavailableReasonKey: currentFailDiscount?.usageLimitFailKey
+      discountList: this.filterEnabledDiscountList(discountList),
+      unavailableReasonKey: discountList.map(_availability.getDiscountUsageLimitFailKey).find(key => key !== null) || null
     };
   }
 
-  // 检查使用次数限制，并返回校验失败原因
-  checkUsageCreditsLimitWithFailKey(discount) {
-    if (!discount.extension_data || discount.extension_data.length === 0) {
-      return null;
-    }
-    const usageCreditsData = discount.extension_data.find(data => data.field_key === 'usage_credits');
-    if (!usageCreditsData) {
-      return null;
-    }
-    const value = usageCreditsData.value;
-
-    // 总次数限制
-    if (value.total_credits && value.total_credits > 0) {
-      if ((discount.total_order_behavior_count || 0) >= value.total_credits) {
-        return 'total_credits';
-      }
-    }
-
-    // 单用户限制
-    if (value.per_user_limit && value.per_user_limit > 0) {
-      if ((discount.customer_order_behavior_count || 0) >= value.per_user_limit) {
-        return 'per_user_limit';
-      }
-    }
-
-    // 单日限制
-    if (value.max_per_day && value.max_per_day > 0) {
-      if ((discount.today_order_behavior_count || 0) >= value.max_per_day) {
-        return 'max_per_day';
-      }
-    }
-
-    // 单周限制
-    if (value.max_per_week && value.max_per_week > 0) {
-      if ((discount.week_order_behavior_count || 0) >= value.max_per_week) {
-        return 'max_per_week';
-      }
-    }
-
-    // 单月限制
-    if (value.max_per_month && value.max_per_month > 0) {
-      if ((discount.month_order_behavior_count || 0) >= value.max_per_month) {
-        return 'max_per_month';
-      }
-    }
-
-    // 全部通过
-    return null;
-  }
-
   // 根据productIds去重
   uniqueByProductId(discountList) {
     return (0, _utils.uniqueById)(discountList, 'product_id');

package/lib/modules/Discount/types.d.ts

@@ -201,6 +201,12 @@ export interface Discount {
     start_time?: string;
     discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
+    /** 本次规则计算的不可用原因；可用性恢复后清除。 */
+    reason?: string;
+    reasonCode?: string;
+    unified_messages?: {
+        title?: string | Record<string, string>;
+    };
     unified_available_status?: number | undefined | null;
 }
 export interface DiscountState {

package/lib/modules/Order/index.js

@@ -9,6 +9,7 @@ var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _availability = require("../Discount/availability");
 var _osPrivatePayload = require("../../utils/os-private-payload");
 var _salesNotes = require("./salesNotes");
 var _paymentUtils = require("./payment-utils");
@@ -496,7 +497,7 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.rules = rules;
   }
   createDefaultRulesHooks() {
-    return (0, _utils.createDefaultOrderRulesHooks)();
+    return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || []);
   }
 
   /**
@@ -524,6 +525,7 @@ class OrderModule extends _BaseModule.BaseModule {
       with_available_wallet_pass_flag: 1,
       with_virtual_currency: 1,
       with_entitlement_pass: 1,
+      filter_order_wallet_pass_usage: 0,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...(orderId ? {
         order_id: orderId
@@ -719,19 +721,31 @@ class OrderModule extends _BaseModule.BaseModule {
       isAvailable: false,
       discountList: this.getDiscountList()
     };
-    const shouldRetainForLater = !isAvailable && unavailableReason === _types2.UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+    const scannedIds = new Set(withScanList.map(discount => String(discount.id)));
+    const evaluatedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(discount => scannedIds.has(String(discount.id)) && isCustomerPromotionDiscount(discount) && !(0, _availability.getDiscountLifecycleReason)(discount));
+    const shouldRetainForLater = !isAvailable && evaluatedScannedDiscounts.length > 0;
     const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
-    const retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
     let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
     if (isAvailable && normalizedNewDiscountList) {
       await this.store.discount?.setDiscountList(normalizedNewDiscountList);
       this.applyDiscount();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
-    } else if (shouldRetainForLater && retainedDiscountList) {
-      // 卡券有效但当前购物车没有适用商品：先保留在 Promotion 中，
-      // 不执行 applyDiscount，避免修改商品价格或订单金额。
-      await this.store.discount?.setDiscountList(retainedDiscountList);
+    } else if (shouldRetainForLater) {
+      // 只合并本次识别的卡券；不把试算产生的其他选券状态写回订单。
+      const retainedDiscounts = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+      evaluatedScannedDiscounts.forEach(discount => {
+        retainedDiscounts.set(String(discount.id), {
+          ...discount,
+          isScan: true,
+          isAvailable: false,
+          isSelected: false,
+          reasonCode: discount.reasonCode || 'product_not_applicable',
+          appliedProductDetails: [],
+          savedAmount: 0
+        });
+      });
+      await this.store.discount?.setDiscountList([...retainedDiscounts.values()]);
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       resolvedDiscountList = this.getDiscountList();
     }
@@ -740,7 +754,7 @@ class OrderModule extends _BaseModule.BaseModule {
       isAvailable: isAvailable || false,
       isAccepted: Boolean(isAvailable || shouldRetainForLater),
       discountList: resolvedDiscountList,
-      scannedDiscountList: resultDiscountList,
+      scannedDiscountList: evaluatedScannedDiscounts,
       unavailableReason
     };
   }

package/lib/modules/Order/utils.d.ts

@@ -161,7 +161,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
  * // => -4
  */
 export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
-export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
+export declare function createDefaultOrderRulesHooks(getBookings?: () => OrderTempOrder['bookings']): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
  * @param {CartItem} cartItem