@pisell/pisellos 2.2.190 → 2.2.192

package/lib/modules/Order/utils.js

@@ -38,12 +38,14 @@ __export(utils_exports, {
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
+  ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
   getOrderProductLineUid: () => getOrderProductLineUid,
+  getProductSkuOptions: () => getProductSkuOptions,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
@@ -56,6 +58,7 @@ __export(utils_exports, {
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
+  normalizeProductSkuOptions: () => normalizeProductSkuOptions,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
   resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
@@ -91,12 +94,36 @@ function composeLinePrice(params) {
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+function normalizeProductSkuOptions(options) {
+  if (!Array.isArray(options))
+    return [];
+  return options.map((option) => {
+    const normalized = {
+      ...option && typeof option === "object" ? option : {}
+    };
+    const addPrice = normalized.add_price ?? normalized.price;
+    if (addPrice !== void 0)
+      normalized.add_price = addPrice;
+    delete normalized.price;
+    return normalized;
+  });
+}
+function ensureProductSku(product) {
+  const rawSku = (product == null ? void 0 : product.product_sku) && typeof product.product_sku === "object" ? product.product_sku : {};
+  return {
+    ...rawSku,
+    option: normalizeProductSkuOptions(rawSku.option)
+  };
+}
+function getProductSkuOptions(product) {
+  return ensureProductSku(product).option;
+}
 function sumOptionUnitPrice(options) {
   let total = new import_decimal.default(0);
   if (!Array.isArray(options))
     return total;
   for (const opt of options) {
-    const price = new import_decimal.default(Number(opt == null ? void 0 : opt.price) || 0);
+    const price = new import_decimal.default(Number((opt == null ? void 0 : opt.add_price) ?? (opt == null ? void 0 : opt.price)) || 0);
     const num = new import_decimal.default(Number(opt == null ? void 0 : opt.num) || 0);
     total = total.plus(price.times(num));
   }
@@ -184,7 +211,7 @@ function resolveEffectivePerUnitDiscount(product) {
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = sumOptionUnitPrice(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
   if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
     const source = Number(metadata.source_product_price);
     const selling = Number(metadata.main_product_selling_price) - optionSum;
@@ -246,7 +273,7 @@ function createDefaultOrderRulesHooks() {
     getProduct: (product) => {
       var _a, _b, _c, _d, _e, _f;
       const metadataAny = product.metadata || {};
-      const optionSum = sumOptionUnitPrice(product.product_option_item);
+      const optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
       let sourcePrice;
       if (metadataAny.source_product_price !== void 0) {
         sourcePrice = String(metadataAny.source_product_price);
@@ -274,7 +301,7 @@ function createDefaultOrderRulesHooks() {
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
-          product.product_option_item,
+          getProductSkuOptions(product),
           product.product_bundle
         )}`,
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
@@ -306,7 +333,7 @@ function createDefaultOrderRulesHooks() {
       const nextNum = Number(values.quantity ?? product.num ?? 1) || 1;
       const metadataAny = product.metadata || {};
       const existedSource = metadataAny.source_product_price ?? product.selling_price ?? "0";
-      const nextOptions = product.product_option_item;
+      const nextOptions = getProductSkuOptions(product);
       const optionSum = sumOptionUnitPrice(nextOptions);
       const nextSourceSellingPrice = values.main_product_selling_price !== void 0 ? String(values.main_product_selling_price) : values.price !== void 0 ? String(values.price) : values.total !== void 0 ? toUnitPriceString(values.total, nextNum) : String(existedSource);
       const nextSourceOriginalPrice = values.original_price !== void 0 ? String(values.original_price) : String(existedSource);
@@ -415,6 +442,7 @@ function formatSubmitOptionItems(options) {
     return [];
   return options.map((d) => {
     const option = {
+      ...d && typeof d === "object" ? d : {},
       num: d == null ? void 0 : d.num,
       option_group_item_id: d == null ? void 0 : d.option_group_item_id,
       option_group_id: d == null ? void 0 : d.option_group_id
@@ -422,6 +450,7 @@ function formatSubmitOptionItems(options) {
     const addPrice = (d == null ? void 0 : d.add_price) ?? (d == null ? void 0 : d.price);
     if (addPrice !== void 0)
       option.add_price = String(addPrice);
+    delete option.price;
     return option;
   });
 }
@@ -485,7 +514,6 @@ function normalizeSubmitProduct(product) {
   const { unique_identification_number: _runtimeUid, ...submitProduct } = product;
   const {
     num,
-    product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
     discount_amount: _deprecatedDiscountAmount,
     discount_type: _deprecatedDiscountType,
@@ -494,6 +522,7 @@ function normalizeSubmitProduct(product) {
     discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
+  delete productRest[`product_${"option"}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
   const cleanMetadata = {};
@@ -527,9 +556,7 @@ function normalizeSubmitProduct(product) {
   }
   const productSku = {
     ...submitProduct.product_sku && typeof submitProduct.product_sku === "object" ? submitProduct.product_sku : {},
-    option: formatSubmitOptionItems(
-      (productOptionItem == null ? void 0 : productOptionItem.length) ? productOptionItem : (_a = submitProduct.product_sku) == null ? void 0 : _a.option
-    )
+    option: formatSubmitOptionItems((_a = submitProduct.product_sku) == null ? void 0 : _a.option)
   };
   return {
     ...productRest,
@@ -872,7 +899,8 @@ function mergeOrderProductDisplayFields(previous, next) {
     "product_cover",
     "cover",
     "variant_title",
-    "product_sku"
+    "product_sku",
+    "payment_price"
   ];
   displayFields.forEach((field) => {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
@@ -919,12 +947,14 @@ function indexOrderProductsByUid(products) {
   createEmptySummary,
   createUuidV4,
   ensureManualProductDiscountList,
+  ensureProductSku,
   findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
   getAllDiscountList,
   getOrderProductLineUid,
+  getProductSkuOptions,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
@@ -937,6 +967,7 @@ function indexOrderProductsByUid(products) {
   normalizeBookingIsAll,
   normalizeBookingSubType,
   normalizeOrderProductDiscountList,
+  normalizeProductSkuOptions,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
   resolveEffectivePerUnitDiscount,

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

@@ -8,7 +8,9 @@ export interface SalesSummaryProduct {
     original_price: string;
     tax_fee: string;
     is_charge_tax?: number;
-    product_option_item?: any[];
+    product_sku?: Record<string, any> & {
+        option?: any[];
+    };
     discount_list?: any[];
     product_bundle?: any[];
     metadata?: Record<string, any>;

package/lib/modules/SalesSummary/utils.js

@@ -35,6 +35,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../Summary/utils");
+var import_utils2 = require("../Order/utils");
 function toDecimal(value) {
   return new import_decimal.default(value || 0);
 }
@@ -75,6 +76,7 @@ function buildSurchargeServiceItems(products) {
     var _a, _b;
     const quantity = getSafeNum(product.num);
     const unitTotal = getUnitPaymentTotal(product);
+    const options = (0, import_utils2.getProductSkuOptions)(product);
     return {
       id: product.product_id,
       num: quantity,
@@ -86,12 +88,12 @@ function buildSurchargeServiceItems(products) {
         product: {
           discount_list: product.discount_list || [],
           product_bundle: product.product_bundle || [],
-          product_option_item: product.product_option_item || []
+          product_sku: product.product_sku || { option: options }
         }
       },
       bundle: product.product_bundle || [],
-      option: product.product_option_item || [],
-      options: product.product_option_item || [],
+      option: options,
+      options,
       relation_details: [],
       metadata: product.metadata || {},
       start_date: ((_a = product.metadata) == null ? void 0 : _a.start_date) || "",

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

@@ -18,7 +18,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
-    private orderSQLiteSaveQueue;
+    private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
+    private recentSqliteWriteByStorageKey;
+    /** 最近一次 SSE 全量拉取完成时间 */
+    private lastServerFullFetchAtMs;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -33,6 +36,35 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
+    /**
+     * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
+     *
+     * @example
+     * this.recordRecentSqliteWrite('upsertOrdersFromRemote', orders)
+     */
+    private recordRecentSqliteWrite;
+    /**
+     * 过滤 pubsub 触发的冗余 SQLite patch（业务 API 刚写入过的 update 回声）。
+     *
+     * @example
+     * const { toWrite, skipped } = this.filterRedundantPatchOrders('pubsub.bodyUpsert', orders, mergeActions)
+     */
+    private filterRedundantPatchOrders;
+    /**
+     * 过滤 pubsub HTTP 增量拉取 ids：本地刚由业务 API 写入的单可跳过 HTTP。
+     *
+     * @example
+     * const ids = this.filterRedundantHttpRefreshIds([99331, 99332])
+     */
+    private filterRedundantHttpRefreshIds;
+    /**
+     * 解析 pubsub 消息会走哪条同步分支，便于对照为何触发 HTTP 重拉或 body 直写。
+     *
+     * @example
+     * this.resolveSyncMessageRoute(msg)
+     * // => { route: 'httpRefresh.batchIds', ... }
+     */
+    private resolveSyncMessageRoute;
     private getOrderSyncThrottleMs;
     preload(): Promise<void>;
     getOrders(): OrderData[];
@@ -120,6 +152,14 @@ export declare class OrderModule extends BaseModule implements Module {
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;
     private getIdKey;
+    /**
+     * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
+     *
+     * @example
+     * const key = this.getOrderStorageKey({ order_id: 1001, external_sale_number: 'S-1001' })
+     * // => 'S-1001'
+     */
+    private getOrderStorageKey;
     /**
      * 当前订单拉取窗口：
      * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
@@ -132,22 +172,35 @@ export declare class OrderModule extends BaseModule implements Module {
     private setStorageItem;
     private loadOrdersFromSQLite;
     /**
-     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
      *
      * @example
      * await this.runInOrderSQLiteSaveQueue(async () => {
-     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
-     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     *   await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, orders)
      * })
      */
     private runInOrderSQLiteSaveQueue;
     /**
-     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     * 批量增量 upsert 订单到 SQLite，不清空表；用于 pubsub / HTTP 增量合并。
+     *
+     * @example
+     * await this.patchOrdersInSQLite(freshOrders)
+     */
+    private patchOrdersInSQLite;
+    /**
+     * 单条 upsert 订单到 SQLite；用于 overwriteExistingOrder 等单条覆盖场景。
+     *
+     * @example
+     * await this.updateOrderInSQLite(freshOrder)
+     */
+    private updateOrderInSQLite;
+    /**
+     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
-     * await this.saveOrdersToSQLite(this.store.list)
+     * await this.replaceOrdersSnapshotInSQLite(orderList)
      */
-    private saveOrdersToSQLite;
+    private replaceOrdersSnapshotInSQLite;
     /**
      * 清空订单模块的内存数据和本地 SQLite 订单表。
      *