@pisell/pisellos 2.2.190 → 2.2.192

package/dist/modules/Order/utils.js

@@ -1,5 +1,5 @@
 var _excluded = ["unique_identification_number"],
-  _excluded2 = ["num", "product_option_item", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
+  _excluded2 = ["num", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
   _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
   _excluded4 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -8,12 +8,12 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -59,9 +59,30 @@ export function composeLinePrice(params) {
   }
   return total.toDecimalPlaces(2).toFixed(2);
 }
+export function normalizeProductSkuOptions(options) {
+  if (!Array.isArray(options)) return [];
+  return options.map(function (option) {
+    var _normalized$add_price;
+    var normalized = _objectSpread({}, option && _typeof(option) === 'object' ? option : {});
+    var addPrice = (_normalized$add_price = normalized.add_price) !== null && _normalized$add_price !== void 0 ? _normalized$add_price : normalized.price;
+    if (addPrice !== undefined) normalized.add_price = addPrice;
+    delete normalized.price;
+    return normalized;
+  });
+}
+export function ensureProductSku(product) {
+  var rawSku = product !== null && product !== void 0 && product.product_sku && _typeof(product.product_sku) === 'object' ? product.product_sku : {};
+  return _objectSpread(_objectSpread({}, rawSku), {}, {
+    option: normalizeProductSkuOptions(rawSku.option)
+  });
+}
+export function getProductSkuOptions(product) {
+  return ensureProductSku(product).option;
+}
 
 /**
- * 计算 option 单价合计：Σ(option.price × option.num)。
+ * 计算 option 单价合计：Σ(option.add_price × option.num)。
+ * 兼容入参仍带旧 `price` 的调用方，但运行时归一化后只维护 `add_price`。
  * 在新语义 v2 下，main_product_original_price = source_product_price + 本函数结果。
  */
 export function sumOptionUnitPrice(options) {
@@ -71,8 +92,9 @@ export function sumOptionUnitPrice(options) {
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _opt$add_price;
       var opt = _step2.value;
-      var price = new Decimal(Number(opt === null || opt === void 0 ? void 0 : opt.price) || 0);
+      var price = new Decimal(Number((_opt$add_price = opt === null || opt === void 0 ? void 0 : opt.add_price) !== null && _opt$add_price !== void 0 ? _opt$add_price : opt === null || opt === void 0 ? void 0 : opt.price) || 0);
       var num = new Decimal(Number(opt === null || opt === void 0 ? void 0 : opt.num) || 0);
       total = total.plus(price.times(num));
     }
@@ -218,7 +240,7 @@ export function resolveEffectivePerUnitDiscount(product) {
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
-  var optionSum = sumOptionUnitPrice(product === null || product === void 0 ? void 0 : product.product_option_item).toNumber();
+  var optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
 
   // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
   if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
@@ -274,7 +296,7 @@ export function createDefaultOrderRulesHooks() {
       var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
-      var optionSum = sumOptionUnitPrice(product.product_option_item);
+      var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
       var sourcePrice;
       if (metadataAny.source_product_price !== undefined) {
         sourcePrice = String(metadataAny.source_product_price);
@@ -298,7 +320,7 @@ export function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
+        _id: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
         // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
         price: sourcePrice,
@@ -327,7 +349,7 @@ export function createDefaultOrderRulesHooks() {
       var nextNum = Number((_ref14 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref14 !== void 0 ? _ref14 : 1) || 1;
       var metadataAny = product.metadata || {};
       var existedSource = (_ref15 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref15 !== void 0 ? _ref15 : '0';
-      var nextOptions = product.product_option_item;
+      var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
 
       // Rules 返回的 main_product_selling_price / price / total 均为 source-level。
@@ -472,13 +494,14 @@ function formatSubmitOptionItems(options) {
   if (!Array.isArray(options)) return [];
   return options.map(function (d) {
     var _d$add_price;
-    var option = {
+    var option = _objectSpread(_objectSpread({}, d && _typeof(d) === 'object' ? d : {}), {}, {
       num: d === null || d === void 0 ? void 0 : d.num,
       option_group_item_id: d === null || d === void 0 ? void 0 : d.option_group_item_id,
       option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
-    };
+    });
     var addPrice = (_d$add_price = d === null || d === void 0 ? void 0 : d.add_price) !== null && _d$add_price !== void 0 ? _d$add_price : d === null || d === void 0 ? void 0 : d.price;
     if (addPrice !== undefined) option.add_price = String(addPrice);
+    delete option.price;
     return option;
   });
 }
@@ -553,7 +576,6 @@ function normalizeSubmitProduct(product) {
     _runtimeUid = _ref19.unique_identification_number,
     submitProduct = _objectWithoutProperties(_ref19, _excluded);
   var num = submitProduct.num,
-    productOptionItem = submitProduct.product_option_item,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
     _deprecatedDiscountType = submitProduct.discount_type,
@@ -561,6 +583,7 @@ function normalizeSubmitProduct(product) {
     _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
     _deprecatedDiscountPer = submitProduct.discount_per,
     productRest = _objectWithoutProperties(submitProduct, _excluded2);
+  delete productRest["product_".concat('option', "_item")];
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
   var cleanMetadata = {};
@@ -582,7 +605,7 @@ function normalizeSubmitProduct(product) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
-    option: formatSubmitOptionItems(productOptionItem !== null && productOptionItem !== void 0 && productOptionItem.length ? productOptionItem : (_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
+    option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
   return _objectSpread(_objectSpread(_objectSpread({}, productRest), bookingUid ? {
     booking_uid: bookingUid
@@ -1017,7 +1040,7 @@ export function isEmptyOrderProductDisplayValue(value) {
  */
 export function mergeOrderProductDisplayFields(previous, next) {
   var merged = _objectSpread({}, next);
-  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku'];
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku', 'payment_price'];
   displayFields.forEach(function (field) {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
       merged[field] = previous[field];

package/dist/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/dist/modules/SalesSummary/utils.js

@@ -8,6 +8,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import Decimal from 'decimal.js';
 import { getSurcharge, getSurchargeAmount } from "../Summary/utils";
+import { getProductSkuOptions } from "../Order/utils";
 function toDecimal(value) {
   return new Decimal(value || 0);
 }
@@ -53,6 +54,7 @@ function buildSurchargeServiceItems(products) {
     var _product$is_charge_ta, _product$metadata5, _product$metadata6;
     var quantity = getSafeNum(product.num);
     var unitTotal = getUnitPaymentTotal(product);
+    var options = getProductSkuOptions(product);
     return {
       id: product.product_id,
       num: quantity,
@@ -64,12 +66,14 @@ 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: options,
       relation_details: [],
       metadata: product.metadata || {},
       start_date: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || '',

package/dist/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 订单表。
      *