@pisell/pisellos 2.2.309 → 2.2.310

package/lib/solution/ShopDiscount/index.js

@@ -7,8 +7,10 @@ exports.default = exports.ShopDiscountImpl = void 0;
 var _BaseModule = require("../../modules/BaseModule");
 var _Discount = require("../../modules/Discount");
 var _Rules = require("../../modules/Rules");
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
 var _utils = require("./utils");
 var _types = require("../../modules/Rules/types");
+var _availability = require("../../modules/Discount/availability");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -125,7 +127,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         customerId: customer.id,
         action: 'create',
         with_good_pass: 1,
-        with_discount_card: 1
+        with_discount_card: 1,
+        with_entitlement_pass: 1
       });
     });
   }
@@ -347,6 +350,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       const {
         productList: newProductList,
         discountList: newDiscountList,
+        evaluatedDiscountList,
         isAvailable,
         unavailableReason
       } = rulesModule.isDiscountListAvailable({
@@ -361,6 +365,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         productList: this.store.productList || [],
         discountList: this.getDiscountList()
       };
+      let isAccepted = isAvailable;
       if (isAvailable) {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
@@ -368,12 +373,34 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         if (this.isWalkIn() && resultDiscountList.length && this.options.otherParams?.platform === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(resultDiscountList[0].customer_id);
         }
+      } else {
+        const scannedIds = new Set(withScanList.map(discount => String(discount.id)));
+        const retainedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(discount => scannedIds.has(String(discount.id)) && !(0, _availability.getDiscountLifecycleReason)(discount));
+        if (retainedScannedDiscounts.length) {
+          const retainedDiscounts = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+          retainedScannedDiscounts.forEach(discount => {
+            retainedDiscounts.set(String(discount.id), {
+              ...discount,
+              isScan: true,
+              isAvailable: false,
+              isSelected: false,
+              reasonCode: discount.reasonCode || 'product_not_applicable',
+              appliedProductDetails: [],
+              savedAmount: 0
+            });
+          });
+          this.setDiscountList([...retainedDiscounts.values()]);
+          this.store.originalDiscountList = this.getDiscountList();
+          await this.store.discount?.setOriginalDiscountList(this.getDiscountList());
+          isAccepted = true;
+        }
       }
       return {
         type: "clientCalc",
         isAvailable: isAvailable || false,
+        isAccepted: Boolean(isAccepted),
         productList: newProductList || this.store.productList || [],
-        discountList: newDiscountList || this.getDiscountList(),
+        discountList: this.getDiscountList(),
         unavailableReason
       };
     } catch (error) {
@@ -416,7 +443,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       if (item.booking_id) {
         const product = this.hooks?.getProduct(item);
         (item.discount_list || []).forEach(discount => {
-          if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
+          if (discount.id && ['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) {
             const index = editModeDiscountList.findIndex(n => n.id === (discount.discount?.resource_id || discount.id));
             if (index !== -1) {
               editModeDiscountList[index] = {
@@ -522,6 +549,8 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         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
@@ -530,17 +559,34 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       const goodPassList = prepareConfigResult?.discountList || [];
       const scanDiscount = this.getDiscountList()?.filter(item => item.isScan);
 
-      // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
-      const scanDiscountIds = scanDiscount.map(n => n.id);
-      const newGoodPassList = goodPassList?.filter(n => !scanDiscountIds.includes(n.id));
-      const newDiscountList = [...scanDiscount, ...(newGoodPassList || [])];
+      // 扫码 Entitlement Pass 与客户列表重复时保留扫码选择状态，但刷新实时余额。
+      // 其他券继续沿用原来的“保留扫码结果、剔除列表重复项”行为。
+      const scanDiscountById = new Map(scanDiscount.map(discount => [String(discount.id), discount]));
+      const refreshedScanEntitlementIds = new Set();
+      const newGoodPassList = goodPassList.flatMap(discount => {
+        const key = String(discount.id);
+        const scannedDiscount = scanDiscountById.get(key);
+        if (!scannedDiscount) return [discount];
+        if ((0, _entitlementPass.isEntitlementPass)(scannedDiscount) && (0, _entitlementPass.isEntitlementPass)(discount)) {
+          refreshedScanEntitlementIds.add(key);
+          return [{
+            ...discount,
+            isScan: true,
+            isSelected: scannedDiscount.isSelected ?? discount.isSelected,
+            isManualSelect: scannedDiscount.isManualSelect ?? discount.isManualSelect
+          }];
+        }
+        return [];
+      });
+      const retainedScanDiscounts = scanDiscount.filter(discount => !refreshedScanEntitlementIds.has(String(discount.id)));
+      const newDiscountList = [...retainedScanDiscounts, ...newGoodPassList];
 
       // 存储原始优惠券列表
       this.store.originalDiscountList = newDiscountList;
       await this.store.discount?.setOriginalDiscountList(newDiscountList);
 
-      // 根据当前预约时间过滤优惠券列表
-      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+      // 日程限制交给 Rules 计算可用状态，展示列表保留当前不可用的卡券。
+      const filteredDiscountList = newDiscountList;
       this.store.filteredDiscountList = filteredDiscountList;
       this.setDiscountList(filteredDiscountList || []);
       if (this.store.productList?.length) {

package/lib/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/lib/solution/ShopDiscount/utils.js

@@ -3,10 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
+exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = exports.getDiscountTimeUnavailableReason = exports.getDiscountListAmountTotal = exports.getDiscountListAmount = exports.getDiscountAmount = exports.getDateIsInSchedule = exports.filterDiscountListByBookingTime = exports.calculateOrderLevelDiscountAllocation = void 0;
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _entitlementPass = require("../../modules/Discount/entitlementPass");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrAfter.default);
+_dayjs.default.extend(_isSameOrBefore.default);
 const uniqueById = (arr, key = 'id') => {
   const seen = new Set();
   return arr.filter(item => !seen.has(item[key]) && seen.add(item[key]));
@@ -35,8 +40,8 @@ const isAllNormalProduct = items => {
  */
 exports.isAllNormalProduct = isAllNormalProduct;
 const getDiscountAmount = (discount, total, price) => {
-  // 商品券
-  if (discount.tag === 'good_pass') {
+  // 商品券和 Entitlement Pass 都是全额抵扣。
+  if ((0, _entitlementPass.isFullCoveragePass)(discount)) {
     return new _decimal.default(price).minus(new _decimal.default(price || 0)).toNumber();
   }
 
@@ -376,41 +381,53 @@ const isInWeeklyRepeatForDate = (targetDate, startDate, repeatRule) => {
 };
 
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 const filterDiscountListByBookingTime = (discountList, bookingTime) => {
-  if (!bookingTime) {
-    return discountList;
-  }
-  return discountList.filter(discount => {
+  if (!bookingTime) return discountList;
+  return discountList.filter(discount => !getDiscountTimeUnavailableReason(discount, bookingTime));
+};
+
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+exports.filterDiscountListByBookingTime = filterDiscountListByBookingTime;
+const getDiscountTimeUnavailableReason = (discount, useTime) => {
+  const useTimeDayjs = (0, _dayjs.default)(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
     if (discount?.metadata?.validity_type === "custom_schedule_validity") {
-      return getDateIsInSchedule(bookingTime, discount.custom_schedule_snapshot?.data || []);
+      return getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || []) ? undefined : 'outside_schedule';
     }
-    try {
-      const isHasStart = !!discount.start_date && !!discount.start_time;
-      const startDate = (0, _dayjs.default)(`${discount.start_date} ${discount.start_time}`);
-      const bookingTimeDayjs = (0, _dayjs.default)(bookingTime);
-
-      // 判断预约时间是否在开始时间之后
-      const isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
-
-      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
-      const isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore((0, _dayjs.default)(discount.expire_time)) : true;
-      return isAfterStart && isBeforeExpire;
-    } catch (error) {
-      return true;
+    const isHasStart = !!discount.start_date && !!discount.start_time;
+    const startDate = (0, _dayjs.default)(`${discount.start_date} ${discount.start_time}`);
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
     }
-  });
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    const expireTime = discount.expire_time ? (0, _dayjs.default)(discount.expire_time) : null;
+    const isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    const validity = discount.extension_data?.find(field => field.field_key === 'valid_times')?.value;
+    if (validity?.restrict_use_by_schedule === true && !getDateIsInSchedule(useTime, discount.custom_schedule_snapshot?.data || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
 };
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣
  * @returns 是否是订单级别的固定金额折扣卡
  */
-exports.filterDiscountListByBookingTime = filterDiscountListByBookingTime;
+exports.getDiscountTimeUnavailableReason = getDiscountTimeUnavailableReason;
 const isOrderLevelFixedAmountDiscount = discount => {
   return discount.tag === 'product_discount_card' && discount?.metadata?.discount_card_type === 'fixed_amount' && discount?.metadata?.discount_calculation_mode === 'order_level';
 };

package/lib/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/lib/solution/UnifiedBookingSales/index.js

@@ -159,7 +159,7 @@ function buildPlannerDiscountResult(params) {
     const productDiscounts = [...(Array.isArray(product.discount_list) ? product.discount_list : []), ...(Array.isArray(product.product_bundle) ? product.product_bundle.flatMap(bundle => bundle?.discount_list || []) : [])];
     productDiscounts.forEach(discount => {
       const 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;
       const discountId = resolvePlannerDiscountId(discount);
       applications.push({
         discountId,
@@ -201,7 +201,7 @@ function isLocalOrderId(orderId) {
 }
 function isCustomerBoundDiscount(discount) {
   const type = discount?.type ?? 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 [];
@@ -1580,14 +1580,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
 
   /**
-   * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-   * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+   * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+   * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
    */
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
     if (configured === true) return true;
     const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
-    return platform !== 'h5' && platform !== 'kiosk';
+    return !(0, _platform.isCustomerUserPlatform)(platform) && platform !== 'kiosk';
   }
 
   /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/lib/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/lib/utils/os-private-payload.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stripOsPrivatePayloadFields = stripOsPrivatePayloadFields;
+var _lodashEs = require("lodash-es");
+const OS_PRIVATE_FIELD_PREFIX = '_os_';
+
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+function stripOsPrivatePayloadFields(data) {
+  const next = (0, _lodashEs.cloneDeep)(data);
+  if (!next || typeof next !== 'object' || Array.isArray(next)) return next;
+  const record = next;
+  Object.keys(record).forEach(key => {
+    if (key.startsWith(OS_PRIVATE_FIELD_PREFIX)) delete record[key];
+  });
+  return next;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.309",
+  "version": "2.2.310",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",