@pisell/pisellos 0.10.41 → 0.10.42

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

@@ -236,6 +236,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
+    /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+    setPickupRef(buzzer: string): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;

package/lib/solution/BaseSales/index.js

@@ -1531,6 +1531,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     this.store.order.syncTempOrderNoteToRemote(orderId, note);
   }
+
+  /** 存储用户自定义取餐标识到当前 tempOrder.buzzer。 */
+  setPickupRef(buzzer) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderBuzzer(buzzer);
+  }
   updateTempOrderShopDiscount(amount) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderShopDiscount(amount);
@@ -1680,7 +1686,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (!this.isPersistedOrderProduct(item)) return;
       (item.discount_list || []).forEach(discount => {
         const discountId = discount.discount?.resource_id || discount.id;
-        if (!discountId || !['good_pass', 'discount_card'].includes(discount.type)) return;
+        if (!discountId || !['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) return;
         const quantity = item.quantity || item.num || item.product_quantity || 1;
         const savedAmount = new _decimal.default(discount.amount || 0).times(quantity).plus(discount?.metadata?.product_discount_difference || 0);
         const index = historyDiscountList.findIndex(n => n.id === discountId);

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -17,6 +17,7 @@ exports.resolveStrategyEligibleProducts = resolveStrategyEligibleProducts;
 exports.resolveStrategyRequiredQuantity = resolveStrategyRequiredQuantity;
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
+var _entitlementPass = require("../../../modules/Discount/entitlementPass");
 var _utils = require("../../../modules/Order/utils");
 var _utils2 = require("../../ScanOrder/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -395,11 +396,16 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
-function hasGoodPassDiscount(product) {
+function getFullCoveragePassDiscountType(product) {
   const productBundle = Array.isArray(product?.product_bundle) ? product.product_bundle : [];
   const extendedBundle = Array.isArray(product?._extend?.other?.bundle) ? product._extend.other.bundle : [];
   const discountLists = [product?.discount_list, ...productBundle.map(item => item?.discount_list), ...extendedBundle.map(item => item?.discount_list)];
-  return discountLists.some(discountList => Array.isArray(discountList) && discountList.some(item => item?.type === 'good_pass' || item?.tag === 'good_pass'));
+  for (const discountList of discountLists) {
+    if (!Array.isArray(discountList)) continue;
+    const pass = discountList.find(item => (0, _entitlementPass.isFullCoveragePass)(item));
+    if (pass) return String(pass.type || pass.tag);
+  }
+  return null;
 }
 
 /**
@@ -412,8 +418,10 @@ function getPromotionLineMergeBoundary(product) {
   if (product?.product_id === undefined || product?.product_id === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
-  if (hasGoodPassDiscount(product)) {
-    return `good-pass:${getOrderProductUid(product)}`;
+  const fullCoveragePassType = getFullCoveragePassDiscountType(product);
+  if (fullCoveragePassType) {
+    const boundary = fullCoveragePassType === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return `${boundary}:${getOrderProductUid(product)}`;
   }
   if (Number(product?.product_sku?.open_sold_weight || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -26,6 +26,8 @@ const searchWalletPass = async (request, code) => {
     // 折扣卡
     'good_pass',
     // 商品券
+    'entitlement_pass',
+    // 月卡 / 年卡 / 多次使用卡
     'session_ticket',
     // 场次票
     'appointment_ticket' // 预约类门票

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

@@ -62,6 +62,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/lib/solution/ShopDiscount/index.js

@@ -7,6 +7,7 @@ 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 _decimal = _interopRequireDefault(require("decimal.js"));
@@ -125,7 +126,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
       });
     });
   }
@@ -416,7 +418,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 +524,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
+        with_entitlement_pass: 1,
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...(orderId ? {
           order_id: orderId
@@ -530,10 +533,27 @@ 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;

package/lib/solution/ShopDiscount/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.uniqueById = exports.isOrderLevelFixedAmountDiscount = exports.isNormalProductByDurationSchedule = exports.isAllNormalProduct = 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 _entitlementPass = require("../../modules/Discount/entitlementPass");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const uniqueById = (arr, key = 'id') => {
   const seen = new Set();
@@ -35,8 +36,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();
   }
 

package/lib/solution/UnifiedBookingSales/index.js

@@ -142,7 +142,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,
@@ -184,7 +184,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 [];
@@ -639,6 +639,22 @@ function normalizeResource(raw, fixedOffsetMinutes = (0, _localClock.captureRunt
   const id = raw.resourceId ?? raw.resource_id ?? raw.id;
   if (id === undefined || id === null || id === '') return null;
   const rawWindows = raw.windows || raw.times || [];
+  const rawExcludedWindows = raw.excludedWindows || raw.excluded_windows || [];
+  const normalizeWindows = windows => (Array.isArray(windows) ? windows : []).flatMap(window => {
+    const range = normalizeAvailabilityLocalDateTimeRange({
+      startAt: window.startAt || window.start_at || window.start,
+      endAt: window.endAt || window.end_at || window.end,
+      fixedOffsetMinutes,
+      rollOverEnd: true
+    });
+    if (!range) return [];
+    return [{
+      startAt: range.startAt,
+      endAt: range.endAt,
+      source: window.source,
+      raw: window
+    }];
+  });
   return {
     id,
     formId: raw.formId ?? raw.form_id ?? raw.resource_form_id,
@@ -646,21 +662,8 @@ function normalizeResource(raw, fixedOffsetMinutes = (0, _localClock.captureRunt
     code: raw.code,
     resourceType: normalizeResourceType(raw.type || raw.resourceType),
     capacity: Math.max(1, Number(raw.capacity || raw.max_capacity || 1) || 1),
-    windows: (Array.isArray(rawWindows) ? rawWindows : []).flatMap(window => {
-      const range = normalizeAvailabilityLocalDateTimeRange({
-        startAt: window.startAt || window.start_at || window.start,
-        endAt: window.endAt || window.end_at || window.end,
-        fixedOffsetMinutes,
-        rollOverEnd: true
-      });
-      if (!range) return [];
-      return [{
-        startAt: range.startAt,
-        endAt: range.endAt,
-        source: window.source,
-        raw: window
-      }];
-    }),
+    windows: normalizeWindows(rawWindows),
+    excludedWindows: normalizeWindows(rawExcludedWindows),
     raw
   };
 }
@@ -679,6 +682,17 @@ function dateRangeDays(dateRange) {
   }
   return dates;
 }
+function getExcludedScheduleDateOverrideTimePoints(date, schedule) {
+  if (!schedule.repeat_rule?.excluded_date?.length) return [];
+  if ((0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, [schedule]).length > 0) return [];
+  return (0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, [{
+    ...schedule,
+    repeat_rule: {
+      ...schedule.repeat_rule,
+      excluded_date: []
+    }
+  }]);
+}
 function normalizeResourceOccupancy(rawEvent, resourceId, source = 'remote', fixedOffsetMinutes = (0, _localClock.captureRuntimeOffsetMinutes)()) {
   const range = normalizeAvailabilityLocalDateTimeRange({
     startAt: rawEvent.start_at ?? rawEvent.startAt ?? rawEvent.start_time ?? rawEvent.startTime,
@@ -771,7 +785,26 @@ function buildAvailabilityResourcesFromV2(params) {
         }
       }];
     })));
+    const excludedWindows = dates.flatMap(date => schedules.flatMap(schedule => getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(slot => {
+      const range = normalizeAvailabilityLocalDateTimeRange({
+        startAt: slot.start_at,
+        endAt: slot.end_at,
+        fixedOffsetMinutes,
+        rollOverEnd: true
+      });
+      if (!range) return [];
+      return [{
+        startAt: range.startAt,
+        endAt: range.endAt,
+        source: `resource_schedule_excluded:${schedule.id}`,
+        raw: {
+          scheduleId: schedule.id,
+          excludedDate: date
+        }
+      }];
+    })));
     resource.windows = materializedWindows.length > 0 ? materializedWindows : explicitWindows;
+    resource.excludedWindows = [...(resource.excludedWindows || []), ...excludedWindows];
     if (resource.windows.length === 0 && missingScheduleIds.length > 0) {
       resource.windows = buildResourceWindowFallbackTimes({
         raw,
@@ -1012,7 +1045,7 @@ function buildBookingFromAvailabilitySelection(params) {
     }
   };
 }
-const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
+const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'schedule_excluded_date', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
 // A required group whose selected resource is outside its window is surfaced
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
@@ -2147,11 +2180,31 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         source: `operating_schedule:${descriptor.scheduleIds.map(String).join(',')}`
       }] : [];
     }));
+    const excludedWindows = dateRangeDays(params.dateRange).flatMap(date => schedules.flatMap(schedule => getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(slot => {
+      const range = normalizeAvailabilityLocalDateTimeRange({
+        startAt: slot.start_at,
+        endAt: slot.end_at,
+        fixedOffsetMinutes: this.getAvailabilityRuntimeOffsetMinutes(),
+        rollOverEnd: true
+      });
+      return range ? [{
+        startAt: range.startAt,
+        endAt: range.endAt,
+        source: `operating_schedule_excluded:${schedule.id}`,
+        raw: {
+          scheduleId: schedule.id,
+          excludedDate: date
+        }
+      }] : [];
+    })));
     return {
       source: descriptor.source,
       scheduleIds: [...descriptor.scheduleIds],
       missingScheduleIds,
-      windows
+      windows,
+      ...(excludedWindows.length > 0 ? {
+        excludedWindows
+      } : {})
     };
   }
   async loadAvailabilityProducts(params) {
@@ -2849,7 +2902,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       } : {})
     }, {
       evaluatedAt: this.getAvailabilityRuntimeDateTime(),
-      allowSessionCustomRanges: isPosAvailabilityRequest
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
+      allowSessionCustomRanges: isPosAvailabilityRequest,
+      allowExcludedScheduleDateOverride: isPosAvailabilityRequest
     }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))
@@ -2864,7 +2919,11 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       refreshed
     } = await this.ensureAvailabilityContextProjection(contextId, 'query_booking_availability');
     this.assertContextualQueryFreshness(context, request);
-    const result = (0, _ResourcePlanner.queryAvailabilityProjection)(projectionEntry.projection, request);
+    const isPosAvailabilityRequest = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
+    const result = (0, _ResourcePlanner.queryAvailabilityProjection)(projectionEntry.projection, request, {
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
+      allowExcludedScheduleDateOverride: isPosAvailabilityRequest
+    });
     const contextVersion = context.activeVersion;
     const contextualResult = result.target === 'time' ? {
       ...result,
@@ -3121,7 +3180,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           } : {})
         } : {})
       }, {
-        allowSessionCustomRanges: allowPosAvailabilityOverride
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+        allowSessionCustomRanges: allowPosAvailabilityOverride,
+        allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       }).flatMap(group => group.ranges);
       const refreshedCandidateBase = refreshedRanges.find(candidate => candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt);
       if (!refreshedCandidateBase) {
@@ -3142,6 +3203,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         requirementSelections: params.requirementSelections,
         partySize,
         bookingCount
+      }, {
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+        allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       });
       if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(conflict => POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code))) {
         const forced = buildPosForcedAvailabilityAssignments({

package/package.json

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