@pisell/pisellos 2.2.264 → 2.2.266

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.js

@@ -214,6 +214,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 +222,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 +366,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 +399,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 +408,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(orderDetailId)
     ].join("#");
   }
@@ -408,6 +418,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(bookingUid)
     ].join("#");
   }
@@ -415,7 +426,8 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_id,
     item.product_variant_id ?? 0,
     fingerprint,
-    noteSignature
+    noteSignature,
+    lineMergeBoundary
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {

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

@@ -233,6 +233,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return String(this.getAppData("device_id") || 0).slice(-2);
   }
   async configureIdGeneratorFromOpenData() {
+    this.setPaymentNumberDevicePrefix(null);
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -264,6 +265,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const resetReceiptSequenceDaily = typeof (openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"]) === "boolean" ? openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"] : false;
     const operatingDayBoundary = this.getAppData("operating_day_boundary");
     const deviceId = await this.getShortNumberOrDeviceId();
+    this.setPaymentNumberDevicePrefix(deviceId);
     const businessCode = this.getBookingTicketBusinessCode();
     if (!businessCode) {
       console.warn("[BookingTicket] businessCode 缺失，跳过 idGenerator 配置");
@@ -341,15 +343,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 +381,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 +879,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 +1155,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) {
@@ -1501,8 +1529,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return result;
   }
   async setOtherParams(params, { cover = false } = {}) {
-    super.setOtherParams(params, { cover });
-    if (params == null ? void 0 : params.businessCode) {
+    await super.setOtherParams(params, { cover });
+    if ((params == null ? void 0 : params.businessCode) !== void 0 || (params == null ? void 0 : params.business_code) !== void 0) {
       await this.configureIdGeneratorFromOpenData();
     }
   }

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/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/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
+});

package/package.json

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