@pisell/pisellos 2.3.20 → 2.3.22

package/lib/server/modules/products/index.d.ts

@@ -2,7 +2,7 @@ import { Module, PisellCore } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import { ProductData } from '../../../modules/Product/types';
 import type { RouteDefinition } from '../../types';
-import { ProductIdScope, ProductFormatter, ProductFormatterContext } from './types';
+import { ProductIdScope, type ProductSnapshot, ProductFormatter, ProductFormatterContext } from './types';
 /**
  * Products 模块 - 用于获取和管理完整的商品详细数据
  * 相比 ProductList 模块，Products 会获取所有详细信息并缓存
@@ -185,6 +185,10 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 获取商品列表（深拷贝，供外部安全使用）
      */
     getProducts(): Promise<ProductData[]>;
+    /**
+     * 批量获取商品轻量快照，供订单详情等响应补齐展示协议字段。
+     */
+    getProductSnapshotsByIds(ids: number[]): Promise<Record<string, ProductSnapshot>>;
     /**
      * 内部获取商品列表的直接引用（无拷贝）
      * 仅供内部 formatter 流程使用，因为 formatter 会创建新对象

package/lib/server/modules/products/index.js

@@ -860,6 +860,26 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     (0, import_product.perfMark)("ProductsModule.getProducts(structuredClone)", performance.now() - t0, { count: result.length });
     return result;
   }
+  /**
+   * 批量获取商品轻量快照，供订单详情等响应补齐展示协议字段。
+   */
+  async getProductSnapshotsByIds(ids) {
+    const snapshots = {};
+    const seen = /* @__PURE__ */ new Set();
+    for (const id of ids) {
+      if (!Number.isFinite(id) || seen.has(id))
+        continue;
+      seen.add(id);
+      const product = this.store.map.get(id);
+      if (!product)
+        continue;
+      snapshots[String(id)] = {
+        cover: product.cover,
+        holder_config: product.holder_config
+      };
+    }
+    return snapshots;
+  }
   /**
    * 内部获取商品列表的直接引用（无拷贝）
    * 仅供内部 formatter 流程使用，因为 formatter 会创建新对象

package/lib/server/modules/products/types.d.ts

@@ -28,6 +28,10 @@ export interface ProductIdScope {
     /** 指定商品集合 ID */
     collectionIds?: number[];
 }
+export interface ProductSnapshot {
+    cover?: ProductData['cover'];
+    holder_config?: ProductData['holder_config'];
+}
 /**
  * 加载报价单商品价格参数
  */

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

@@ -191,6 +191,16 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
     }>;
     getDiscountList(): Discount[];
+    /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+    getOriginalDiscountList(): Discount[];
+    /**
+     * 同步写入 Discount 模块的 discountList / originalDiscountList。
+     * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+     */
+    replaceDiscountStoreLists(params: {
+        discountList: Discount[];
+        originalDiscountList?: Discount[];
+    }): Promise<void>;
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;

package/lib/solution/BaseSales/index.js

@@ -102,7 +102,25 @@ function getBaseSalesMetadataUid(item, metadataKey) {
     return null;
   return String(uid);
 }
-function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
+function isBaseSalesBlankValue(value) {
+  return value === void 0 || value === null || value === "";
+}
+function mergeBaseSalesProductSnapshotFields(currentItem, loadedItem) {
+  var _a, _b, _c;
+  const mergedItem = (0, import_lodash_es.cloneDeep)(loadedItem);
+  if (isBaseSalesBlankValue(mergedItem.product_cover) && !isBaseSalesBlankValue(currentItem == null ? void 0 : currentItem.product_cover)) {
+    mergedItem.product_cover = currentItem.product_cover;
+  }
+  const currentHolderConfig = (_a = currentItem == null ? void 0 : currentItem.metadata) == null ? void 0 : _a.holder_config;
+  if ((((_b = mergedItem.metadata) == null ? void 0 : _b.holder_config) === void 0 || ((_c = mergedItem.metadata) == null ? void 0 : _c.holder_config) === null) && currentHolderConfig !== void 0 && currentHolderConfig !== null) {
+    mergedItem.metadata = {
+      ...mergedItem.metadata || {},
+      holder_config: currentHolderConfig
+    };
+  }
+  return mergedItem;
+}
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, arrayKey) {
   const result = [];
   const indexByUid = /* @__PURE__ */ new Map();
   const appendOrReplaceByUid = (item) => {
@@ -114,7 +132,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
     }
     const existingIndex = indexByUid.get(uid);
     if (existingIndex !== void 0) {
-      result[existingIndex] = clonedItem;
+      result[existingIndex] = arrayKey === "products" ? mergeBaseSalesProductSnapshotFields(result[existingIndex], clonedItem) : clonedItem;
       return;
     }
     indexByUid.set(uid, result.length);
@@ -134,7 +152,7 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
       if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
         const metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
         if (metadataKey) {
-          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
+          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, key);
         }
         return [
           ...(0, import_lodash_es.cloneDeep)(currentValue),
@@ -260,7 +278,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.order)
       return;
     this.serverOrderChangeHydrateInFlight = (async () => {
-      const sales = await this.store.order.hydrateTempOrderFromRecord(changedOrder, {
+      var _a, _b;
+      const currentTempOrder = (_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a);
+      const record = mergeSalesDetailRecordWithTempOrder(currentTempOrder, changedOrder);
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
         recalcOnHydrate: false
       });
       this.currentSalesDetail = sales;
@@ -1094,7 +1115,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1165,13 +1186,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       };
     }
     if (rulesModule) {
-      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record) || [];
-      const orderTotalAmount = Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0);
+      const orderTotalAmount = Number(((_l = orderStore.summary) == null ? void 0 : _l.total_amount) || 0);
       console.log("[BaseSales.applyDiscountConfig.calcDiscount]");
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
-        holders,
+        holders: [],
         isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
@@ -1182,8 +1202,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         );
       }
       for (const product of tempOrder.products || []) {
-        const productUid = (_n = product.metadata) == null ? void 0 : _n.unique_identification_number;
-        const runtimeOrigin = productUid ? (_q = (_p = (_o = tempOrder._extend) == null ? void 0 : _o.productsByUid) == null ? void 0 : _p[productUid]) == null ? void 0 : _q.origin : void 0;
+        const productUid = (_m = product.metadata) == null ? void 0 : _m.unique_identification_number;
+        const runtimeOrigin = productUid ? (_p = (_o = (_n = tempOrder._extend) == null ? void 0 : _n.productsByUid) == null ? void 0 : _o[productUid]) == null ? void 0 : _p.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
@@ -1191,7 +1211,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_r = product.metadata) == null ? void 0 : _r.source_product_price) ?? (((_s = product.metadata) == null ? void 0 : _s.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_q = product.metadata) == null ? void 0 : _q.source_product_price) ?? (((_r = product.metadata) == null ? void 0 : _r.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -1227,7 +1247,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1246,13 +1266,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record) || [];
-      const orderTotalAmount = Number(((_d = orderStore.summary) == null ? void 0 : _d.total_amount) || 0);
+      const orderTotalAmount = Number(((_c = orderStore.summary) == null ? void 0 : _c.total_amount) || 0);
       console.log("[BaseSales.bestDiscount.calcDiscount]");
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
-        holders,
+        holders: [],
         isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
       }) || result;
@@ -1286,6 +1305,30 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     return this.store.order.getDiscountList();
   }
+  /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
+  getOriginalDiscountList() {
+    var _a, _b;
+    if (!this.store.order)
+      return [];
+    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
+    return ((_b = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
+  }
+  /**
+   * 同步写入 Discount 模块的 discountList / originalDiscountList。
+   * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
+   */
+  async replaceDiscountStoreLists(params) {
+    var _a;
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
+    if (!discountModule)
+      return;
+    if (params.originalDiscountList) {
+      await discountModule.setOriginalDiscountList(params.originalDiscountList);
+    }
+    await discountModule.setDiscountList(params.discountList);
+  }
   async scanPromotionCode(code, customerId) {
     try {
       if (!this.store.order)
@@ -1298,7 +1341,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return {
         isAvailable: raw.isAvailable,
         type: raw.type,
-        unavailableReason: raw.unavailableReason
+        unavailableReason: raw.unavailableReason,
+        scannedDiscountList: raw.scannedDiscountList
       };
     } catch (error) {
       throw error;
@@ -1306,7 +1350,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   // TODO 需要优化，这段逻辑太长了，里面应该有些历史遗留问题
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
@@ -1323,17 +1367,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
       const rulesModule = orderStore.rules;
-      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record) || [];
       let nextDiscountList = updated;
       await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
       if (rulesModule) {
-        const orderTotalAmount = Number(((_b = orderStore.summary) == null ? void 0 : _b.total_amount) || 0);
+        const orderTotalAmount = Number(((_a = orderStore.summary) == null ? void 0 : _a.total_amount) || 0);
         console.log("[BaseSales.setDiscountSelected.calcDiscount]");
         const result = rulesModule.calcDiscount(
           {
             productList: tempOrder.products,
             discountList: updated,
-            holders,
+            holders: [],
             isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
             orderTotalAmount
           },
@@ -1373,8 +1416,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         return rid != null && selectedResourceIds.has(rid);
       });
       for (const product of tempOrder.products) {
-        const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
-        const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
+        const productUid = (_b = product.metadata) == null ? void 0 : _b.unique_identification_number;
+        const runtimeOrigin = productUid ? (_e = (_d = (_c = tempOrder._extend) == null ? void 0 : _c.productsByUid) == null ? void 0 : _d[productUid]) == null ? void 0 : _e.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         product.discount_list = filterSelectedDiscountDetails(product.discount_list);
@@ -1398,7 +1441,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_g = product.metadata) == null ? void 0 : _g.source_product_price) ?? (((_h = product.metadata) == null ? void 0 : _h.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_f = product.metadata) == null ? void 0 : _f.source_product_price) ?? (((_g = product.metadata) == null ? void 0 : _g.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {

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/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/BookingTicket/index.js

@@ -341,15 +341,21 @@ 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();
     }
     return {
       isAvailable: raw.isAvailable,
       type: raw.type,
-      unavailableReason: raw.unavailableReason
+      unavailableReason: raw.unavailableReason,
+      scannedDiscountList: raw.scannedDiscountList
     };
   }
   async hydrateOrderCustomerFromScanDiscounts(discounts) {
@@ -366,11 +372,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;

package/package.json

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