@pisell/pisellos 2.2.264 → 2.2.265

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

@@ -1,3 +1,4 @@
+import type { Discount } from '../../modules/Discount/types';
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -85,6 +86,8 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     booking_uid?: string;
     /** 多语言商品标题快照，随 tempOrder 提交到 checkout。 */
     product_title?: BaseSalesLocalizedText;
+    /** 商品封面图快照，随 tempOrder 提交到 checkout。 */
+    product_cover?: string;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -381,9 +384,11 @@ export interface BaseSalesLoggerRuntimeConfig {
 }
 export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 }
-/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
+    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,7 +78,6 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
-    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -268,8 +267,7 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
- *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
+ * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`

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

@@ -77,43 +77,19 @@ function getOrderProductOriginalPriceForPromotion(product) {
   }
   return getOrderProductBasePrice(product);
 }
-var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
-var ITEM_REWARD = "ITEM_REWARD";
-function isItemRewardPromotionDiscountItem(item) {
-  var _a, _b;
-  return (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === ITEM_REWARD;
-}
-function isManagedPromotionDiscountItem(item) {
-  if ((item == null ? void 0 : item.type) === "promotion")
-    return true;
-  return isItemRewardPromotionDiscountItem(item);
-}
-function wasInPromotionBeforeEvaluation(item) {
-  var _a, _b;
-  if (((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true)
-    return true;
-  return Array.isArray(item == null ? void 0 : item.discount_list) && item.discount_list.some(isItemRewardPromotionDiscountItem);
-}
-function updatePromotionDiscountList(item, promotionDiscount, options) {
+function updatePromotionDiscountList(item, promotionDiscount) {
   let discountList = Array.isArray(item.discount_list) ? [...item.discount_list] : [];
-  discountList = discountList.filter((d) => !isManagedPromotionDiscountItem(d));
+  discountList = discountList.filter((d) => (d == null ? void 0 : d.type) !== "promotion");
   if (promotionDiscount) {
-    const discountType = (options == null ? void 0 : options.discountType) || "promotion";
     discountList.push({
-      type: discountType,
+      type: "promotion",
       amount: promotionDiscount.amount,
       discount: {
         original_amount: promotionDiscount.original_amount,
         fixed_amount: promotionDiscount.fixed_amount,
         title: promotionDiscount.title,
         resource_id: ""
-      },
-      ...discountType === "product" ? {
-        metadata: {
-          source: "promotion",
-          actionType: (options == null ? void 0 : options.actionType) || ITEM_REWARD
-        }
-      } : {}
+      }
     });
   }
   if (discountList.length > 0) {
@@ -122,15 +98,7 @@ function updatePromotionDiscountList(item, promotionDiscount, options) {
     delete item.discount_list;
   }
 }
-function evaluatorHasActionType(evaluator, actionType) {
-  var _a;
-  const configs = (_a = evaluator == null ? void 0 : evaluator.getStrategyConfigs) == null ? void 0 : _a.call(evaluator);
-  if (!Array.isArray(configs))
-    return false;
-  return configs.some(
-    (config) => ((config == null ? void 0 : config.actions) || []).some((action) => (action == null ? void 0 : action.type) === actionType)
-  );
-}
+var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
   const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
@@ -157,9 +125,6 @@ function applyPromoUnitPriceToLine(item, input) {
       amount: discountAmount,
       original_amount: catalogSource,
       fixed_amount: discountAmount
-    }, {
-      actionType: input.actionType,
-      discountType: input.actionType === ITEM_REWARD ? "product" : "promotion"
     });
   } else {
     updatePromotionDiscountList(item, null);
@@ -214,6 +179,7 @@ function mergeIdenticalPromotionCartLines(products) {
       promotion.finalPrice ?? ((_c = line.metadata) == null ? void 0 : _c.main_product_selling_price) ?? ""
     );
     const noteSignature = getProductLineNoteSignature(line);
+    const lineMergeBoundary = getPromotionLineMergeBoundary(line);
     const bookingUid = (line == null ? void 0 : line.booking_uid) ?? ((_d = line == null ? void 0 : line.metadata) == null ? void 0 : _d.booking_uid);
     const orderDetailId = (line == null ? void 0 : line.order_detail_id) ?? (line == null ? void 0 : line.orderDetailId);
     const mergeKey = [
@@ -221,6 +187,7 @@ function mergeIdenticalPromotionCartLines(products) {
       line.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       bookingUid ? String(bookingUid) : "",
       orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "" ? String(orderDetailId) : "",
       promotion.strategyId,
@@ -364,6 +331,12 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function getPromotionLineMergeBoundary(product) {
+  var _a;
+  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+    return "";
+  return `edit:${getOrderProductUid(product)}`;
+}
 function isPersistedGeneratedVoucher(product) {
   const orderDetailId = (product == null ? void 0 : product.order_detail_id) ?? (product == null ? void 0 : product.orderDetailId);
   if (orderDetailId === void 0 || orderDetailId === null || orderDetailId === "") {
@@ -391,6 +364,7 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_bundle
   );
   const noteSignature = getProductLineNoteSignature(item);
+  const lineMergeBoundary = getPromotionLineMergeBoundary(item);
   const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
   const orderDetailId = (item == null ? void 0 : item.order_detail_id) ?? (item == null ? void 0 : item.orderDetailId);
   if (orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "") {
@@ -399,6 +373,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(orderDetailId)
     ].join("#");
   }
@@ -408,6 +383,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(bookingUid)
     ].join("#");
   }
@@ -415,17 +391,19 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_id,
     item.product_variant_id ?? 0,
     fingerprint,
-    noteSignature
+    noteSignature,
+    lineMergeBoundary
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {
+  var _a, _b;
   if (!Array.isArray(entries) || entries.length <= 1) {
     return [...entries || []];
   }
   const groups = /* @__PURE__ */ new Map();
   for (const { item, originalListIndex } of entries) {
     const key = buildConsolidateKeyForPromotion(item);
-    const wasInPromotion = wasInPromotionBeforeEvaluation(item);
+    const wasInPromotion = ((_b = (_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a._promotion) == null ? void 0 : _b.inPromotion) === true;
     const existing = groups.get(key);
     if (!existing) {
       const mergedItem = (0, import_lodash_es.cloneDeep)(item);
@@ -491,9 +469,6 @@ function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
 function generateNumericId() {
   return Math.floor(Math.random() * 1e9) + Date.now();
 }
-function isBookingEditProductLine(product) {
-  return (product == null ? void 0 : product.booking_id) !== void 0 && (product == null ? void 0 : product.booking_id) !== null && product.booking_id !== 0 && product.booking_id !== "0";
-}
 function convertToPromotionProduct(product, index) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
   const numericId = generateNumericId();
@@ -506,7 +481,6 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((product == null ? void 0 : product.num) ?? 1) || 1,
     bundle: getProductBundleForEvaluator(product),
-    _promotionOnlyForItemReward: isBookingEditProductLine(product),
     _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
@@ -608,9 +582,6 @@ function resolveStrategyRequiredQuantity(matched) {
   if (matched.actionType === "BUY_X_GET_Y_FREE") {
     return Number(detail.buyQuantity) || 1;
   }
-  if (matched.actionType === "ITEM_REWARD") {
-    return Number(detail.triggerQuantity) || 1;
-  }
   return 1;
 }
 function resolveStrategyEligibleProducts(matched) {
@@ -721,10 +692,6 @@ function processCartPromotion(list, evaluator, options) {
   };
   if (!list || list.length === 0 || !evaluator)
     return empty;
-  const shouldIncludeEditProductsForItemReward = evaluatorHasActionType(
-    evaluator,
-    ITEM_REWARD
-  );
   const mainProductsWithIndex = [];
   const existingGiftsWithIndex = [];
   const editProductsWithIndex = [];
@@ -735,12 +702,8 @@ function processCartPromotion(list, evaluator, options) {
       editProductsWithIndex.push({ item, originalListIndex: i });
     } else if (giftInfo) {
       existingGiftsWithIndex.push({ item, originalListIndex: i });
-    } else if (isBookingEditProductLine(item)) {
-      if (shouldIncludeEditProductsForItemReward) {
-        mainProductsWithIndex.push({ item, originalListIndex: i });
-      } else {
-        editProductsWithIndex.push({ item, originalListIndex: i });
-      }
+    } else if ((item == null ? void 0 : item.booking_id) !== void 0 && (item == null ? void 0 : item.booking_id) !== null && item.booking_id !== 0 && item.booking_id !== "0") {
+      editProductsWithIndex.push({ item, originalListIndex: i });
     } else {
       mainProductsWithIndex.push({ item, originalListIndex: i });
     }
@@ -783,8 +746,7 @@ function processCartPromotion(list, evaluator, options) {
       name: ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.product_name) || (item == null ? void 0 : item.title) || "",
       price: getOrderProductBasePrice(item),
       quantity: Number((item == null ? void 0 : item.num) ?? 1) || 1,
-      bundle: getProductBundleForEvaluator(item),
-      _promotionOnlyForItemReward: isBookingEditProductLine(item)
+      bundle: getProductBundleForEvaluator(item)
     };
   });
   for (let i = 0; i < consolidatedMainProductsWithIndex.length; i++) {
@@ -853,7 +815,7 @@ function processCartPromotion(list, evaluator, options) {
     const metadata = newItem.metadata || {};
     const sourceCartNum = (0, import_utils2.getSafeProductNum)(originalItem.num);
     newItem._sourceCartNum = sourceCartNum;
-    const wasInPromotion = wasInPromotionBeforeEvaluation(originalItem) || originalItem._wasInPromotionBeforeConsolidate === true;
+    const wasInPromotion = ((_a = metadata._promotion) == null ? void 0 : _a.inPromotion) === true || originalItem._wasInPromotionBeforeConsolidate === true;
     delete metadata._promotion;
     if (Array.isArray(newItem.product_bundle)) {
       for (const b of newItem.product_bundle) {
@@ -870,8 +832,7 @@ function processCartPromotion(list, evaluator, options) {
         applyPromoUnitPriceToLine(newItem, {
           promoUnitPrice,
           originalBasePrice,
-          strategyTitle: (_a = priced.strategyMetadata) == null ? void 0 : _a.name,
-          actionType: priced.strategyId ? (_b = strategyActionMap.get(priced.strategyId)) == null ? void 0 : _b.actionType : void 0
+          strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
         });
       } else {
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -2,7 +2,7 @@
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
  * - 纯函数：不依赖任何运行时模块/插件，便于单测与 view-model 适配
- * - products 保留 tempOrder / 后端详情原字段，仅做浅拷贝，避免丢失 product_sku 等协议字段
+ * - products 保留 tempOrder / 后端详情原字段，仅规范化集合身份并浅拷贝，避免丢失 product_sku 等协议字段
  * - bookings 平铺保留服务端原顺序，同时输出 byProductUid 反查表与 rootBooking
  * - header 收敛"非数组顶层字段"，便于 ticketBooking view-model 直接消费
  *
@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {
@@ -130,7 +135,7 @@ export interface ISalesDetail {
     customer: ISalesDetailCustomer | null;
     /** 服务端 summary（仅输出） */
     summary: Record<string, any>;
-    /** 原始响应快照，方便 UI 兜底使用 */
+    /** 规范化后的响应快照，方便 UI 兜底使用 */
     raw: Record<string, any>;
 }
 /**
@@ -138,7 +143,7 @@ export interface ISalesDetail {
  *
  * 注意：
  * - 入参允许是 `{ data: OrderData }` 或直接 `OrderData`，自动识别。
- * - products 保留原字段；字段补齐由 OrderModule hydrate 负责。
+ * - products/bookings/payments 在此补齐集合身份；其余 runtime 字段由 OrderModule hydrate 负责。
  * - 不做远程请求；不修改入参；返回新对象。
  */
 export declare function parseSalesResponse(input: Record<string, any> | null | undefined): ISalesDetail;

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

@@ -22,6 +22,7 @@ __export(parseSalesResponse_exports, {
   parseSalesResponse: () => parseSalesResponse
 });
 module.exports = __toCommonJS(parseSalesResponse_exports);
+var import_orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
 var HEADER_KEYS = [
   "order_id",
   "order_number",
@@ -121,14 +122,12 @@ function indexBookingsByProductUid(bookings) {
   return result;
 }
 function parseSalesResponse(input) {
-  const raw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
+  const sourceRaw = input && typeof input === "object" && input.data && input.order_id == null ? input.data : input || {};
+  const raw = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceRaw).order;
   const productsRaw = Array.isArray(raw == null ? void 0 : raw.products) ? raw.products : [];
-  const products = productsRaw.map((p, index) => {
+  const products = productsRaw.map((p) => {
     const row = { ...p || {} };
     const metadata = row.metadata && typeof row.metadata === "object" ? { ...row.metadata } : {};
-    if (!metadata.unique_identification_number) {
-      metadata.unique_identification_number = `sales-product-${row.product_id ?? "unknown"}-${row.product_variant_id ?? 0}-${index}`;
-    }
     delete metadata.price_schema_version;
     delete row.identity_key;
     return { ...row, metadata };

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

@@ -50,6 +50,12 @@ function toPriceString(value, fallback = "0.00") {
     return fallback;
   return parsedValue.toFixed(2);
 }
+function isBlankValue(value) {
+  return value === void 0 || value === null || typeof value === "string" && value.trim() === "";
+}
+function firstNonBlank(...values) {
+  return values.find((value) => !isBlankValue(value));
+}
 function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
@@ -198,6 +204,7 @@ function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
+    holder_config: sourceProduct == null ? void 0 : sourceProduct.holder_config,
     ...hasPriceOverride ? {
       price_override: String(payload.price_override),
       is_manual_discount: 1
@@ -236,6 +243,7 @@ function transformBaseProductToOrderProduct(params) {
     metadata,
     note: payload.note != null ? String(payload.note) : "",
     product_title: productTitle,
+    product_cover: firstNonBlank(matchedVariant == null ? void 0 : matchedVariant.cover, sourceProduct == null ? void 0 : sourceProduct.cover),
     _origin: {
       ...sourceProduct || {},
       callbackData: payload

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

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

package/lib/solution/BookingTicket/index.js

@@ -341,15 +341,28 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const raw = await this.store.order.scanCode(code, customerId);
+    const scannedList = raw.scannedDiscountList || [];
+    const extractedCustomerId = this.getDiscountCustomerId(scannedList);
+    const hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
+    if (!hasOrderCustomer && extractedCustomerId) {
+      await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+    }
     if (raw.isAvailable) {
-      await this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      const tempOrder = this.store.order.ensureTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: this.store.order.getDiscountList(),
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
     }
     return {
       isAvailable: raw.isAvailable,
       type: raw.type,
-      unavailableReason: raw.unavailableReason
+      unavailableReason: raw.unavailableReason,
+      scannedDiscountList: raw.scannedDiscountList
     };
   }
   async hydrateOrderCustomerFromScanDiscounts(discounts) {
@@ -366,11 +379,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.setOrderCustomer(customer);
   }
   getDiscountCustomerId(discounts) {
-    const discount = discounts.find((item) => item.customer_id != null);
-    const customerId = Number(discount == null ? void 0 : discount.customer_id);
-    if (!Number.isFinite(customerId) || customerId <= 0)
-      return null;
-    return customerId;
+    for (const item of discounts) {
+      const topLevelId = Number(item.customer_id);
+      if (Number.isFinite(topLevelId) && topLevelId > 0) {
+        return topLevelId;
+      }
+    }
+    return null;
   }
   async resolveCustomerByDiscountCustomerId(customerId) {
     var _a;
@@ -862,7 +877,17 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));
     void ((_b = discountModule == null ? void 0 : discountModule.setDiscountList) == null ? void 0 : _b.call(discountModule, []));
     this.store.order.applyDiscount();
-    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => this.store.order.persistTempOrder()).catch((error) => {
+    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => {
+      var _a2;
+      const tempOrder = this.store.order.ensureTempOrder();
+      this.store.order.persistTempOrder();
+      return this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: ((_a2 = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _a2.call(discountModule)) || [],
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
+    }).catch((error) => {
       console.error("Failed to recalculate summary after clearing customer:", error);
     });
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, null);
@@ -1128,7 +1153,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    return this.store.bookingContext.getBookingConfig();
+    var _a;
+    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {

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

@@ -83,6 +83,8 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/lib/solution/Sales/index.js

@@ -39,6 +39,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
+var UNPAID_PAYMENT_STATUSES = /* @__PURE__ */ new Set(["unpaid", "partially_paid", "payment_processing"]);
 var SalesImpl = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -258,6 +259,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  isUnpaidBooking(booking) {
+    return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+  }
   countBookingOrders(bookings) {
     const orderIds = /* @__PURE__ */ new Set();
     bookings.forEach((booking) => {
@@ -631,9 +635,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    const unpaidBookingList = matchedBookingList.filter(
-      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
-    );
+    const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)

package/lib/solution/ScanOrder/index.js

@@ -48,10 +48,6 @@ var import_utils2 = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_itemRule = require("../../model/strategy/adapter/itemRule");
 __reExport(ScanOrder_exports, require("./types"), module.exports);
-function isItemRewardProductDiscount(discount) {
-  var _a, _b;
-  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-}
 var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -746,10 +742,6 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
-        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
-          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-          continue;
-        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/lib/solution/ShopDiscount/index.js

@@ -505,7 +505,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -514,6 +514,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
+      const goodPassList = (prepareConfigResult == null ? void 0 : prepareConfigResult.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );

package/lib/solution/VenueBooking/index.js

@@ -65,10 +65,6 @@ var OPEN_DATA_SECTION_CODES = [
   "workflow",
   "checkout"
 ];
-function isItemRewardProductDiscount(discount) {
-  var _a, _b;
-  return (discount == null ? void 0 : discount.type) === "product" && ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-}
 function cloneCustomDepositData(customDepositData) {
   if (!customDepositData || typeof customDepositData !== "object")
     return void 0;
@@ -1343,10 +1339,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
           continue;
-        if ((product.discount_list || []).some(isItemRewardProductDiscount)) {
-          product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-          continue;
-        }
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
           const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;

package/lib/utils/payment-number.d.ts

@@ -0,0 +1,9 @@
+export type PaymentNumberAppDataGetter = (key: string) => unknown;
+/**
+ * Resolve the synchronous fallback without caching runtime device data.
+ */
+export declare function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData: PaymentNumberAppDataGetter): string;
+/**
+ * Resolve the latest device segment when a new payment number is generated.
+ */
+export declare function resolvePaymentNumberDevicePrefix(getAppData: PaymentNumberAppDataGetter): Promise<string>;

package/lib/utils/payment-number.js

@@ -0,0 +1,64 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/payment-number.ts
+var payment_number_exports = {};
+__export(payment_number_exports, {
+  resolvePaymentNumberDevicePrefix: () => resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId: () => resolvePaymentNumberDevicePrefixFromDeviceId
+});
+module.exports = __toCommonJS(payment_number_exports);
+function normalizeNonEmptyString(value) {
+  if (value === void 0 || value === null)
+    return null;
+  if (typeof value !== "string" && typeof value !== "number")
+    return null;
+  if (typeof value === "number" && !Number.isFinite(value))
+    return null;
+  const normalized = String(value).trim();
+  return normalized || null;
+}
+function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData) {
+  try {
+    const deviceId = normalizeNonEmptyString(getAppData("device_id"));
+    if (deviceId && deviceId !== "0")
+      return deviceId.slice(-2);
+  } catch {
+  }
+  return "LOCAL";
+}
+async function resolvePaymentNumberDevicePrefix(getAppData) {
+  try {
+    const getAsyncIotDeviceInfo = getAppData("async_iot_device_info");
+    if (typeof getAsyncIotDeviceInfo === "function") {
+      const info = await getAsyncIotDeviceInfo();
+      const shortNumber = normalizeNonEmptyString(
+        info == null ? void 0 : info.short_number
+      );
+      if (shortNumber && shortNumber !== "0")
+        return shortNumber;
+    }
+  } catch {
+  }
+  return resolvePaymentNumberDevicePrefixFromDeviceId(getAppData);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId
+});