@pisell/pisellos 2.2.309 → 2.2.310

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -17,7 +17,8 @@ export var searchWalletPass = /*#__PURE__*/function () {
             // 翻译识别码名称 0:不翻译 1:翻译
             relation_product: 1,
             // 组装关联商品: 0不处理 1处理
-            with: ['customer'],
+            with_franchisor_data: 1,
+            with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
             tags: ['point_card',
             // 积分卡
             'gift_card',
@@ -28,6 +29,8 @@ export var searchWalletPass = /*#__PURE__*/function () {
             // 折扣卡
             'good_pass',
             // 商品券
+            'entitlement_pass',
+            // 月卡 / 年卡 / 多次使用卡
             'session_ticket',
             // 场次票
             'appointment_ticket' // 预约类门票
@@ -74,14 +77,15 @@ export var searchWallet = /*#__PURE__*/function () {
         case 0:
           params = {
             code: code,
-            with_customer: 1
+            with_customer: 1,
+            with_franchisor_data: 1
           };
           _context2.prev = 1;
           _context2.next = 4;
           return request === null || request === void 0 ? void 0 : request.post('/wallet/detail/search', params);
         case 4:
           res = _context2.sent;
-          if (!((res === null || res === void 0 ? void 0 : res.code) == 200 && !!(res !== null && res !== void 0 && res.data))) {
+          if (!((res === null || res === void 0 ? void 0 : res.status) === true && (res === null || res === void 0 ? void 0 : res.code) === 200 && !!(res !== null && res !== void 0 && res.data))) {
             _context2.next = 7;
             break;
           }
@@ -90,7 +94,7 @@ export var searchWallet = /*#__PURE__*/function () {
             response: res
           });
         case 7:
-          throw new Error('没有找到对应的识别码');
+          throw new Error((res === null || res === void 0 ? void 0 : res.message) || '没有找到对应的识别码');
         case 10:
           _context2.prev = 10;
           _context2.t0 = _context2["catch"](1);

package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts

@@ -6,6 +6,12 @@ export interface GlobalScanFormattedResult {
     searchType: GlobalScanSearchType;
     data: any;
     scanCode: string;
+    /** Wallet / Wallet Pass 来源客户 ID；跨店时必须先解析为当前店客户。 */
+    customerId?: string | number;
+    /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
+    isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.js

@@ -1,3 +1,9 @@
+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); }
 /**
  * 全局扫码搜索结果格式化（对齐 ticketBooking `formatScanGlobal`）。
  */
@@ -27,16 +33,23 @@ export function formatGlobalScanResult(raw, scanCode) {
     return {
       searchType: searchType,
       data: resultData === null || resultData === void 0 ? void 0 : resultData.customer,
-      scanCode: scanCode
+      scanCode: scanCode,
+      customerId: resultData === null || resultData === void 0 ? void 0 : resultData.customer_id,
+      isCrossShopWallet: (resultData === null || resultData === void 0 ? void 0 : resultData.is_cross_shop_wallet) === true || Number(resultData === null || resultData === void 0 ? void 0 : resultData.is_cross_shop_wallet) === 1
     };
   }
   if (searchType === 'walletPass') {
-    var _resultData$;
-    return {
+    var _firstResult$franchis, _ref2, _ref3, _firstResult$customer, _firstResult$holder, _firstResult$customer2, _firstResult$customer3;
+    var firstResult = resultData === null || resultData === void 0 ? void 0 : resultData[0];
+    var isWalletPassUnavailableAtStore = (firstResult === null || firstResult === void 0 ? void 0 : firstResult.is_franchisor_pass) === 1 && (firstResult === null || firstResult === void 0 || (_firstResult$franchis = firstResult.franchisee_wallet_pass) === null || _firstResult$franchis === void 0 ? void 0 : _firstResult$franchis.use) !== 'enabled';
+    return _objectSpread({
       searchType: searchType,
-      data: resultData === null || resultData === void 0 || (_resultData$ = resultData[0]) === null || _resultData$ === void 0 ? void 0 : _resultData$.customer,
-      scanCode: scanCode
-    };
+      data: firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer,
+      scanCode: scanCode,
+      customerId: (_ref2 = (_ref3 = (_firstResult$customer = firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer_id) !== null && _firstResult$customer !== void 0 ? _firstResult$customer : firstResult === null || firstResult === void 0 || (_firstResult$holder = firstResult.holder) === null || _firstResult$holder === void 0 ? void 0 : _firstResult$holder.customer_id) !== null && _ref3 !== void 0 ? _ref3 : firstResult === null || firstResult === void 0 || (_firstResult$customer2 = firstResult.customer) === null || _firstResult$customer2 === void 0 ? void 0 : _firstResult$customer2.id) !== null && _ref2 !== void 0 ? _ref2 : firstResult === null || firstResult === void 0 || (_firstResult$customer3 = firstResult.customer) === null || _firstResult$customer3 === void 0 ? void 0 : _firstResult$customer3.customer_id
+    }, isWalletPassUnavailableAtStore ? {
+      isWalletPassUnavailableAtStore: true
+    } : {});
   }
   if (searchType === 'product' || searchType === 'local_product') {
     return {

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

@@ -43,6 +43,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
@@ -62,6 +63,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
     }): Promise<void>;
 }
 export default ShopDiscountImpl;

package/dist/solution/ShopDiscount/index.js

@@ -27,8 +27,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { DiscountModule } from "../../modules/Discount";
 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) {
@@ -203,7 +205,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           customerId: customer.id,
           action: 'create',
           with_good_pass: 1,
-          with_discount_card: 1
+          with_discount_card: 1,
+          with_entitlement_pass: 1
         });
       });
     }
@@ -439,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:
@@ -521,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", {
@@ -554,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);
@@ -568,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);
     }
 
     // =========== 私有辅助方法 ===========
@@ -614,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) {
@@ -622,7 +660,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           var _this3$hooks;
           var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+            if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
               var index = editModeDiscountList.findIndex(function (n) {
                 var _discount$discount;
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
@@ -697,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;
     }
@@ -706,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()) || [];
     }
 
     // 获取客户钱包信息
@@ -789,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, scanDiscountIds, newGoodPassList, 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:
@@ -799,12 +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
@@ -814,44 +854,61 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               goodPassList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
-              }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-              scanDiscountIds = scanDiscount.map(function (n) {
-                return n.id;
+              }); // 扫码 Entitlement Pass 与客户列表重复时保留扫码选择状态，但刷新实时余额。
+              // 其他券继续沿用原来的“保留扫码结果、剔除列表重复项”行为。
+              scanDiscountById = new Map(scanDiscount.map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              refreshedScanEntitlementIds = new Set();
+              newGoodPassList = goodPassList.flatMap(function (discount) {
+                var key = String(discount.id);
+                var scannedDiscount = scanDiscountById.get(key);
+                if (!scannedDiscount) return [discount];
+                if (isEntitlementPass(scannedDiscount) && isEntitlementPass(discount)) {
+                  var _scannedDiscount$isSe, _scannedDiscount$isMa;
+                  refreshedScanEntitlementIds.add(key);
+                  return [_objectSpread(_objectSpread({}, discount), {}, {
+                    isScan: true,
+                    isSelected: (_scannedDiscount$isSe = scannedDiscount.isSelected) !== null && _scannedDiscount$isSe !== void 0 ? _scannedDiscount$isSe : discount.isSelected,
+                    isManualSelect: (_scannedDiscount$isMa = scannedDiscount.isManualSelect) !== null && _scannedDiscount$isMa !== void 0 ? _scannedDiscount$isMa : discount.isManualSelect
+                  })];
+                }
+                return [];
               });
-              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
-                return !scanDiscountIds.includes(n.id);
+              retainedScanDiscounts = scanDiscount.filter(function (discount) {
+                return !refreshedScanEntitlementIds.has(String(discount.id));
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
+              newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 14;
-              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 14:
-              // 根据当前预约时间过滤优惠券列表
-              filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+              _context10.next = 16;
+              return (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setOriginalDiscountList(newDiscountList);
+            case 16:
+              // 日程限制交给 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)) {
-                _context10.next = 21;
+                _context10.next = 23;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 21:
               _context10.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 23:
-              _context10.next = 28;
-              break;
+              _context10.next = 25;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 25:
-              _context10.prev = 25;
+              _context10.next = 30;
+              break;
+            case 27:
+              _context10.prev = 27;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 28:
+            case 30:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 25]]);
+        }, _callee10, this, [[0, 27]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

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,6 +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();
@@ -41,8 +46,8 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
   var _discount$metadata;
-  // 商品券
-  if (discount.tag === 'good_pass') {
+  // 商品券和 Entitlement Pass 都是全额抵扣。
+  if (isFullCoveragePass(discount)) {
     return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
@@ -439,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/dist/solution/UnifiedBookingSales/index.d.ts

@@ -127,8 +127,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/dist/solution/UnifiedBookingSales/index.js

@@ -166,7 +166,7 @@ export function buildPlannerDiscountResult(params) {
     productDiscounts.forEach(function (discount) {
       var _product$product_id, _product$metadata;
       var type = discount.tag || discount.type;
-      if (!['good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
+      if (!['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
       var discountId = resolvePlannerDiscountId(discount);
       applications.push({
         discountId: discountId,
@@ -218,7 +218,7 @@ function isLocalOrderId(orderId) {
 function isCustomerBoundDiscount(discount) {
   var _discount$type;
   var type = (_discount$type = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type !== void 0 ? _discount$type : discount === null || discount === void 0 ? void 0 : discount.tag;
-  return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
+  return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
 }
 function filterCustomerBoundDiscounts(discountList) {
   if (!Array.isArray(discountList)) return [];
@@ -1903,8 +1903,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
   }, {
     key: "shouldUseCheckoutSyncTask",
@@ -1913,7 +1913,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
       var configured = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.checkoutSyncTaskEnabled;
       if (configured === true) return true;
       var platform = normalizeRuntimePlatform((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.platform);
-      return platform !== 'h5' && platform !== 'kiosk';
+      return !isCustomerUserPlatform(platform) && platform !== 'kiosk';
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/dist/utils/os-private-payload.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+export declare function stripOsPrivatePayloadFields<T>(data: T): T;

package/dist/utils/os-private-payload.js

@@ -0,0 +1,17 @@
+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); }
+import { cloneDeep } from 'lodash-es';
+var OS_PRIVATE_FIELD_PREFIX = '_os_';
+
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+export function stripOsPrivatePayloadFields(data) {
+  var next = cloneDeep(data);
+  if (!next || _typeof(next) !== 'object' || Array.isArray(next)) return next;
+  var record = next;
+  Object.keys(record).forEach(function (key) {
+    if (key.startsWith(OS_PRIVATE_FIELD_PREFIX)) delete record[key];
+  });
+  return next;
+}

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

@@ -171,9 +171,9 @@ function buildBookingConfigQueryKey(params = {}) {
   return JSON.stringify(sorted);
 }
 function resolveBookingConfigRequest(platform, params = {}) {
-  const isH5 = (0, _platform.normalizeRuntimePlatform)(platform) === 'h5';
-  const endpoint = isH5 ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
-  const query = isH5 ? {
+  const isCustomerPlatform = (0, _platform.isCustomerUserPlatform)(platform);
+  const endpoint = isCustomerPlatform ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
+  const query = isCustomerPlatform ? {
     item_type: params.item_type || DEFAULT_BOOKING_CONFIG_PARAMS.item_type
   } : {
     ...DEFAULT_BOOKING_CONFIG_PARAMS,