@pisell/pisellos 0.10.64 → 0.10.65

package/lib/modules/Order/index.js

@@ -20,6 +20,7 @@ var _weighedProduct = require("./utils/weighedProduct");
 var _pickupTiming = require("./pickupTiming");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _availability = require("../Discount/availability");
+var _productVoucherGroups = require("./utils/productVoucherGroups");
 var _osPrivatePayload = require("../../utils/os-private-payload");
 var _salesNotes = require("./salesNotes");
 var _paymentUtils = require("./payment-utils");
@@ -148,7 +149,7 @@ class OrderModule extends _BaseModule.BaseModule {
   orderHooks;
   cartCommandQueue = Promise.resolve();
   queueCartCommand(run) {
-    if (!this.orderHooks?.onBeforeCartCommit) return run();
+    if (!this.orderHooks?.onBeforeCartCommit && !this.store.tempOrder?._extend?.productVoucherGroups?.length) return run();
     const pending = this.cartCommandQueue.then(run, run);
     this.cartCommandQueue = pending.catch(() => undefined);
     return pending;
@@ -158,7 +159,7 @@ class OrderModule extends _BaseModule.BaseModule {
   beginCartMutation() {
     const current = this.ensureTempOrder();
     const guard = this.orderHooks?.onBeforeCartCommit;
-    if (!guard) return {
+    if (!guard && !current._extend?.productVoucherGroups?.length) return {
       current,
       draft: current,
       commit: undefined
@@ -169,7 +170,8 @@ class OrderModule extends _BaseModule.BaseModule {
       current,
       draft,
       commit: async beforeCommit => {
-        await guard({
+        (0, _productVoucherGroups.validateProductVoucherGroups)(draft, this.getDiscountList(), before);
+        await guard?.({
           currentItems: (0, _lodashEs.cloneDeep)(before.products),
           proposedItems: (0, _lodashEs.cloneDeep)(draft.products)
         });
@@ -190,6 +192,7 @@ class OrderModule extends _BaseModule.BaseModule {
   async prepareCheckout(prepare) {
     const run = async () => {
       const order = this.ensureTempOrder();
+      (0, _productVoucherGroups.validateProductVoucherGroups)(order, this.getDiscountList(), undefined, true);
       const items = (0, _lodashEs.cloneDeep)(order.products);
       const result = await prepare(items);
       if (this.store.tempOrder !== order || !(0, _lodashEs.isEqual)(order.products, items)) {
@@ -197,6 +200,7 @@ class OrderModule extends _BaseModule.BaseModule {
           code: 'SALES_GUARD_REJECTED'
         });
       }
+      (0, _productVoucherGroups.validateProductVoucherGroups)(order, this.getDiscountList(), undefined, true);
       return result;
     };
     const pending = this.cartCommandQueue.then(run, run);
@@ -601,6 +605,26 @@ class OrderModule extends _BaseModule.BaseModule {
       hooks: this.rulesHooksOverride || this.createDefaultRulesHooks()
     });
     this.store.rules = rules;
+    rules.setDiscountScope((product, discount) => (0, _productVoucherGroups.allowsProductVoucher)(this.store.tempOrder, product, discount));
+  }
+  setProductVoucherGroups(groups) {
+    const order = this.ensureTempOrder();
+    const ids = new Set();
+    const keys = new Set();
+    const known = new Map(this.getDiscountList().map(discount => [String(discount.id), discount]));
+    for (const group of groups) {
+      if (!group.key || keys.has(group.key)) throw (0, _productVoucherGroups.voucherGroupError)();
+      keys.add(group.key);
+      for (const id of group.discountIds) {
+        const discount = known.get(String(id));
+        if (!discount || (discount.tag || discount.type) !== 'good_pass' || ids.has(String(id))) throw (0, _productVoucherGroups.voucherGroupError)();
+        ids.add(String(id));
+      }
+    }
+    this.ensureExtend(order).productVoucherGroups = (0, _lodashEs.cloneDeep)(groups);
+  }
+  validateProductVoucherSelection() {
+    (0, _productVoucherGroups.validateProductVoucherGroups)(this.ensureTempOrder(), this.getDiscountList(), undefined, true);
   }
   createDefaultRulesHooks() {
     return (0, _utils.createDefaultOrderRulesHooks)(() => this.store.tempOrder?.bookings || [], () => this.store.tempOrder?.holder_relations);
@@ -752,7 +776,7 @@ class OrderModule extends _BaseModule.BaseModule {
       apply: false
     });
   }
-  async scanCode(code, customerId) {
+  async scanCode(code, customerId, options) {
     const beforeCommit = this.createCartIntentCommitGuard('scan_promotion');
     if (this.isActiveVirtualSettlementOrder(this.store.tempOrder)) {
       return {
@@ -764,16 +788,22 @@ class OrderModule extends _BaseModule.BaseModule {
         unavailableReason: _types2.UnavailableReason.ProductNotApplicable
       };
     }
+    const scanOrderKey = this.getDiscountConfigOrderIdentityKey(this.store.tempOrder);
     const resultDiscountWithReason = (await this.store.discount?.batchSearch(code, {
       customerId
     })) || {
       discountList: [],
       unavailableReasonKey: null
     };
+    if (scanOrderKey !== this.getDiscountConfigOrderIdentityKey(this.store.tempOrder)) {
+      throw Object.assign(new Error('The scan session ended.'), {
+        code: 'SALES_GUARD_REJECTED'
+      });
+    }
     const {
-      discountList: resultDiscountList,
       unavailableReasonKey
     } = resultDiscountWithReason;
+    const resultDiscountList = resultDiscountWithReason.discountList.filter(discount => !options?.productVouchersOnly || (discount.tag || discount.type) === 'good_pass');
     const rulesModule = this.store.rules;
     if (!rulesModule) {
       return {
@@ -800,7 +830,7 @@ class OrderModule extends _BaseModule.BaseModule {
       isScan: true
     }));
     const currentSelected = this.getDiscountList().filter(n => n.isSelected);
-    if (currentSelected.length && currentSelected.some(n => withScanList.some(m => m.id === n.id))) {
+    if (currentSelected.length && (options?.productVouchersOnly ? withScanList.every(scanned => currentSelected.some(selected => selected.id === scanned.id)) : currentSelected.some(n => withScanList.some(m => m.id === n.id)))) {
       beforeCommit();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
@@ -2307,8 +2337,12 @@ class OrderModule extends _BaseModule.BaseModule {
       ...existed,
       ...(origin !== undefined ? {
         origin
+      } : {}),
+      ...(rawProduct._productVoucherGroupKey ? {
+        productVoucherGroupKey: rawProduct._productVoucherGroupKey
       } : {})
     };
+    delete normalizedProduct._productVoucherGroupKey;
     delete normalizedProduct._origin;
     delete normalizedProduct.unique_identification_number;
   }
@@ -3602,6 +3636,7 @@ class OrderModule extends _BaseModule.BaseModule {
     const isIncomingCustomItem = productToAdd.metadata?.origin?.isCustomItem === true || productToAdd._origin?.isCustomItem === true;
     const shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || hasIncomingHolder || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(item => {
+      if ((0, _productVoucherGroups.productVoucherGroupKey)(tempOrder, item) !== productToAdd._productVoucherGroupKey) return false;
       if (this.hasGoodPassDiscount(item)) return false;
       if ((0, _holderRelations.getProductHolderRelations)(tempOrder, item).length > 0 || (0, _utils.hasAssignedHolderId)(item.metadata?.holder_id)) return false;
       const isRuntimeEntitlementPass = this.isRuntimeEntitlementAppend(item, tempOrder);
@@ -3791,6 +3826,13 @@ class OrderModule extends _BaseModule.BaseModule {
     const mutation = this.beginCartMutation();
     let tempOrder = mutation.draft;
     const beforeCommit = this.createCartIntentCommitGuard('add_product', mutation.current);
+    if (options?.productVoucherGroupKey) {
+      if (!tempOrder._extend?.productVoucherGroups?.some(group => group.key === options.productVoucherGroupKey)) throw (0, _productVoucherGroups.voucherGroupError)();
+      product = {
+        ...product,
+        _productVoucherGroupKey: options.productVoucherGroupKey
+      };
+    }
     const salesNoteDrafts = (options?.salesNotes || []).map(draft => ({
       note_type: String(draft.note_type || '').trim(),
       text: {
@@ -4734,6 +4776,7 @@ class OrderModule extends _BaseModule.BaseModule {
   }
   async runSubmitTempOrder(params) {
     const tempOrder = this.ensureTempOrder();
+    (0, _productVoucherGroups.validateProductVoucherGroups)(tempOrder, this.getDiscountList(), undefined, true);
     this.prepareVirtualSettlementTempOrder(tempOrder);
     const isOnlineStorePlatform = this.isOnlineStorePlatform();
     const shouldConfirmPendingVoucherPayments = params?.confirmPendingVoucherPayments !== false;

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

@@ -456,6 +456,8 @@ export type AddProductBookingInput = Record<string, any>;
  * 避免步进器修改数量改变该组展示位置。
  */
 export interface AddProductToOrderOptions {
+    /** Associates a selection with an existing runtime voucher group. */
+    productVoucherGroupKey?: string;
     insertAfterProductUid?: string;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;

package/lib/modules/Order/utils/discountProductLineIdentity.js

@@ -241,7 +241,7 @@ function consolidateDiscountFreeProductLines(tempOrder) {
         bundle_selling_price: String(bundle?.bundle_selling_price ?? '')
       }))
     });
-    const mergeKey = [discountSplitOriginUid, product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
+    const mergeKey = [discountSplitOriginUid, productUid ? tempOrder._extend?.productsByUid?.[productUid]?.productVoucherGroupKey ?? '' : '', product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
     const matchedIndex = productIndexByKey.get(mergeKey);
 
     // 当前拆分来源 + 商品结构组合第一次出现时，保留该行作为回并目标。

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

@@ -0,0 +1,15 @@
+import type { Discount } from '../../Discount/types';
+import type { OrderTempOrder } from '../types';
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+export interface ProductVoucherGroup {
+    key: string;
+    discountIds: Array<number | string>;
+}
+export declare function productVoucherGroupKey(order: OrderTempOrder, product: any): string | undefined;
+export declare function isUsableProductVoucher(discount: Discount): boolean;
+export declare function voucherGroupError(): Error & {
+    code: string;
+};
+export declare function allowsProductVoucher(order: OrderTempOrder | null | undefined, product: any, discount: Discount): boolean;
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+export declare function validateProductVoucherGroups(order: OrderTempOrder, discounts: Discount[], previous?: OrderTempOrder, requireCoverage?: boolean): void;

package/lib/modules/Order/utils/productVoucherGroups.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.allowsProductVoucher = allowsProductVoucher;
+exports.isUsableProductVoucher = isUsableProductVoucher;
+exports.productVoucherGroupKey = productVoucherGroupKey;
+exports.validateProductVoucherGroups = validateProductVoucherGroups;
+exports.voucherGroupError = voucherGroupError;
+var _availability = require("../../Discount/availability");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _utils = require("../../../solution/ShopDiscount/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+
+function productVoucherGroupKey(order, product) {
+  const uid = product?.metadata?.unique_identification_number ?? product?.unique_identification_number;
+  return order._extend?.productsByUid?.[String(uid)]?.productVoucherGroupKey;
+}
+function isUsableProductVoucher(discount) {
+  return (discount.tag || discount.type) === 'good_pass' && !discount.isEditMode && !discount.isDisabled && !(0, _availability.getDiscountUsageBlockReason)(discount) && !(0, _utils.getDiscountTimeUnavailableReason)(discount, (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss'));
+}
+function voucherGroupError() {
+  return Object.assign(new Error('The selected items no longer match the available vouchers. Please adjust your selection.'), {
+    code: 'PRODUCT_VOUCHER_GROUP_INVALID'
+  });
+}
+function allowsProductVoucher(order, product, discount) {
+  const groups = order?._extend?.productVoucherGroups;
+  if (!order || !groups?.length) return true;
+  const key = productVoucherGroupKey(order, product);
+  if (!key) return !groups.some(group => group.discountIds.some(id => String(id) === String(discount.id)));
+  return (discount.tag || discount.type) === 'good_pass' && Boolean(groups.find(group => group.key === key)?.discountIds.some(id => String(id) === String(discount.id)));
+}
+
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+function validateProductVoucherGroups(order, discounts, previous, requireCoverage = false) {
+  const groups = order._extend?.productVoucherGroups;
+  if (!groups?.length) return;
+  const usedIds = new Set();
+  const byId = new Map(discounts.filter(isUsableProductVoucher).map(discount => [String(discount.id), discount]));
+  const quantity = item => Number(item.num ?? item.product_quantity ?? 0);
+  for (const group of groups) {
+    const items = order.products.filter(item => productVoucherGroupKey(order, item) === group.key);
+    const selected = items.reduce((sum, item) => sum + quantity(item), 0);
+    const before = previous?.products.filter(item => productVoucherGroupKey(previous, item) === group.key).reduce((sum, item) => sum + quantity(item), 0) ?? 0;
+    if (!requireCoverage && previous && selected <= before) continue;
+    const ids = new Set(group.discountIds.map(String).filter(id => byId.has(id)));
+    if (!Number.isInteger(selected) || selected < 0 || selected > ids.size) throw voucherGroupError();
+    if (!requireCoverage) continue;
+    for (const item of items) {
+      const applied = (item.discount_list || []).filter(entry => (entry.type || entry.tag) === 'good_pass');
+      // Rules splits a good_pass allocation into one physical line per instance.
+      const id = String(applied[0]?.discount?.resource_id ?? '');
+      const voucher = byId.get(id);
+      if (quantity(item) !== 1 || applied.length !== 1 || !ids.has(id) || !voucher?.isAvailable || voucher.config?.isAvailable === false || usedIds.has(id)) throw voucherGroupError();
+      usedIds.add(id);
+    }
+  }
+  if (order.products.some(item => !groups.some(group => group.key === productVoucherGroupKey(order, item)))) {
+    throw voucherGroupError();
+  }
+}

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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

@@ -9,6 +9,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     private store;
     window: WindowPlugin;
     private hooks;
+    private discountScope?;
+    setDiscountScope(scope: (product: any, discount: Discount) => boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;

package/lib/modules/Rules/index.js

@@ -20,6 +20,10 @@ class RulesModule extends _BaseModule.BaseModule {
   store;
   window; // WindowPlugin 实例
   hooks;
+  discountScope;
+  setDiscountScope(scope) {
+    this.discountScope = scope;
+  }
   constructor(name, version) {
     super(name, version);
     this.hooks = {};
@@ -722,6 +726,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
     // 辅助函数：检查商品是否对某个折扣卡可用
     const checkItemApplicableForDiscount = (flatItem, discount) => {
+      if (this.discountScope && !this.discountScope(flatItem.originProduct, discount)) return false;
       if (discount.config?.isAvailable === false) return false;
       let product;
       if (flatItem.type === 'main') {
@@ -1093,6 +1098,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
       const applicableDiscounts = sortedDiscountList.filter(discount => {
+        if (this.discountScope && !this.discountScope(originProduct, discount)) return false;
         if (this.isItemRewardProductDiscount(product)) return false;
         // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
         const discountType = discount.tag || discount.type;

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

@@ -338,7 +338,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
         originalDiscountList?: Discount[];
     }): Promise<void>;
-    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    scanPromotionCode(code: string, customerId?: number, options?: {
+        productVouchersOnly?: boolean;
+    }): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
@@ -519,6 +521,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
+    setProductVoucherGroups(groups: Array<{
+        key: string;
+        discountIds: Array<number | string>;
+    }>): void;
+    validateProductVoucherSelection(): void;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -2412,10 +2412,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     await discountModule.setDiscountList(params.discountList);
   }
-  async scanPromotionCode(code, customerId) {
+  async scanPromotionCode(code, customerId, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const raw = await this.store.order.scanCode(code, customerId);
+      const raw = await this.store.order.scanCode(code, customerId, options);
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({
           createIfMissing: true
@@ -4112,6 +4112,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
+  setProductVoucherGroups(groups) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.setProductVoucherGroups(groups);
+  }
+  validateProductVoucherSelection() {
+    this.store.order?.validateProductVoucherSelection();
+  }
   async addProductToOrder(product, booking, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');

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

@@ -373,7 +373,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -465,7 +465,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -1699,6 +1699,20 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           return bridge.openBookingEdit(payload);
         } : undefined
       } : undefined;
+      if (guardedBridge?.scanScope === 'product-voucher') {
+        if (!guardedBridge.applyPromotionCode) return {
+          status: 'failed',
+          reason: 'no_bridge'
+        };
+        const promotion = await guardedBridge.applyPromotionCode(trimmed);
+        return promotion.isAccepted ?? promotion.isAvailable ? {
+          status: 'success',
+          kind: 'promotion'
+        } : {
+          status: 'failed',
+          reason: 'not_found'
+        };
+      }
       const localSearch = v => this.store.products.findProductsByCodeOrBarcode(v);
       const scanCallback = (0, _handleScan.handleGlobalScan)(this.request, localSearch, this.getSubmitOrderSalesChannel());
       const raw = await scanCallback({

package/lib/solution/BookingTicket/types.d.ts

@@ -208,6 +208,8 @@ export interface AddAddTimeProductsToBookingInput {
 }
 /** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
 export interface GlobalScanHostBridge {
+    /** Restrict redemption scans before customer/product side effects. */
+    scanScope?: 'all' | 'product-voucher';
     openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
     openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
     confirmDetail?: (input: {

package/package.json

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