@pisell/pisellos 2.2.197 → 2.2.199

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

@@ -44,6 +44,7 @@ var ORDER_SQLITE_DEDUPE_MS = 15e3;
 var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "upsertOrdersFromRemote",
+  "upsertPendingSyncOrders",
   "overwriteExistingOrder"
 ]);
 var OrderModule = class extends import_BaseModule.BaseModule {
@@ -484,6 +485,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
     await this.mergeOrdersToStore(freshOrders, "upsertOrdersFromRemote");
   }
+  /**
+   * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+   * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+   */
+  async upsertPendingSyncOrders(pendingOrders) {
+    if (!(pendingOrders == null ? void 0 : pendingOrders.length)) {
+      this.logInfo("upsertPendingSyncOrders-订单列表为空", {});
+      return;
+    }
+    const pendingMap = /* @__PURE__ */ new Map();
+    for (const order of pendingOrders) {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey)
+        continue;
+      pendingMap.set(storageKey, order);
+    }
+    if (pendingMap.size === 0) {
+      this.logError("upsertPendingSyncOrders-订单缺少可落库标识", {
+        count: pendingOrders.length
+      });
+      return;
+    }
+    this.logInfo("upsertPendingSyncOrders-开始", { count: pendingMap.size });
+    const patchedOrders = [...pendingMap.values()];
+    const mergeActions = {};
+    const updatedList = this.store.list.map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !pendingMap.has(storageKey))
+        return order;
+      const pendingOrder = pendingMap.get(storageKey);
+      pendingMap.delete(storageKey);
+      mergeActions[storageKey] = "update";
+      return pendingOrder;
+    });
+    for (const [storageKey, order] of pendingMap.entries()) {
+      mergeActions[storageKey] = "insert";
+      updatedList.push(order);
+    }
+    this.store.list = updatedList;
+    this.syncOrdersMap();
+    await this.patchOrdersInSQLite(patchedOrders, "upsertPendingSyncOrders", mergeActions);
+    this.logInfo("upsertPendingSyncOrders-结束", {
+      count: patchedOrders.length,
+      storeOrderCountAfter: this.store.list.length
+    });
+    this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);
+  }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
    */
@@ -778,12 +826,32 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const id = order == null ? void 0 : order.order_id;
       if (id === void 0 || id === null)
         continue;
-      freshMap.set(this.getIdKey(id), order);
+      freshMap.set(this.getIdKey(id), this.normalizeRemoteSyncedOrder(order));
+    }
+    const freshStorageKeyMap = /* @__PURE__ */ new Map();
+    for (const order of freshMap.values()) {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey)
+        continue;
+      freshStorageKeyMap.set(storageKey, order);
     }
     const uniqueFreshCount = freshMap.size;
     const patchedOrders = [...freshMap.values()];
     const mergeActions = {};
     const updatedList = this.store.list.map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (storageKey && freshStorageKeyMap.has(storageKey)) {
+        const fresh2 = freshStorageKeyMap.get(storageKey);
+        freshStorageKeyMap.delete(storageKey);
+        const freshId = fresh2.order_id;
+        if (freshId !== void 0 && freshId !== null) {
+          freshMap.delete(this.getIdKey(freshId));
+          mergeActions[this.getIdKey(freshId)] = "update";
+        } else {
+          mergeActions[storageKey] = "update";
+        }
+        return fresh2;
+      }
       const id = order.order_id;
       if (id === void 0 || id === null)
         return order;
@@ -960,6 +1028,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  isPendingSyncOrder(order) {
+    return Number(order == null ? void 0 : order.need_sync) === 1;
+  }
+  normalizeRemoteSyncedOrder(order) {
+    if (this.isPendingSyncOrder(order))
+      return order;
+    return {
+      ...order,
+      need_sync: 0
+    };
+  }
+  mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
+    const merged = remoteOrders.map((order) => this.normalizeRemoteSyncedOrder(order));
+    const remoteStorageKeys = new Set(
+      merged.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    for (const order of existingOrders) {
+      if (!this.isPendingSyncOrder(order))
+        continue;
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || remoteStorageKeys.has(storageKey))
+        continue;
+      merged.push(order);
+      remoteStorageKeys.add(storageKey);
+    }
+    return merged;
+  }
   /**
    * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
    *
@@ -1083,12 +1178,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.dbManager) {
       return;
     }
-    const orderListSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
+    const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
+        const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
+        const orderListSnapshot = this.mergeRemoteSnapshotWithPendingOrders(
+          remoteSnapshot,
+          existingOrders || []
+        );
         this.logInfo("replaceOrdersSnapshotInSQLite-开始", {
           source,
-          count: orderListSnapshot.length
+          count: orderListSnapshot.length,
+          remoteCount: remoteSnapshot.length,
+          preservedPendingCount: orderListSnapshot.length - remoteSnapshot.length
         });
         await this.dbManager.clear(INDEXDB_STORE_NAME);
         this.logInfo("replaceOrdersSnapshotInSQLite-clear完成", {
@@ -1107,7 +1209,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch (error) {
       this.logError("全量保存订单到 SQLite 失败", {
         error: error instanceof Error ? error.message : String(error),
-        orderList: orderListSnapshot.length
+        orderList: remoteSnapshot.length
       });
     }
   }

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

@@ -393,6 +393,8 @@ export interface OrderData {
     /** 本地辅助字段 */
     shop_id?: number;
     create_date?: string;
+    /** 本地待同步标记：1 表示需要后续同步到云端 */
+    need_sync?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */

package/lib/solution/BaseSales/index.js

@@ -1301,7 +1301,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
     const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
-    return products.map((product) => {
+    const walletProducts = products.map((product) => {
       const metadata = product.metadata || {};
       return {
         product_id: product.product_id,
@@ -1345,6 +1345,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         })
       };
     });
+    return walletProducts;
   }
   async initWalletData(params) {
     if (!this.store.order)

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

@@ -126,6 +126,7 @@ export interface BaseSalesSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges?: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

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

@@ -73,15 +73,29 @@ function normalizeBundleItems(bundleItems, preferPriceField = false) {
     const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0" : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0";
     const unitStr = toPriceString(unitSelling, "0.00");
     const num = toSafePositiveInt((bundleItem == null ? void 0 : bundleItem.num) ?? (bundleItem == null ? void 0 : bundleItem.quantity), 1);
-    return {
+    const magnitudeSource = {
+      ...bundleItem,
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: bundleItem.price ?? bundleItem.custom_price
+    };
+    const normalizedItem = {
       ...bundleItem,
       num,
       quantity: (bundleItem == null ? void 0 : bundleItem.quantity) ?? num,
+      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
       price: bundleItem.price ?? unitStr,
       bundle_selling_price: unitStr,
       original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
       option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
     };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    return normalizedItem;
   });
 }
 function findVariantById(origin, variantId) {

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 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -115,6 +115,7 @@ export interface ScanOrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

package/lib/solution/ScanOrder/utils.js

@@ -75,6 +75,7 @@ function createEmptySummary() {
     shipping_tax_fee: "0.00",
     tax_fee: "0.00",
     surcharge_fee: "0.00",
+    surcharges: [],
     discount_amount: "0.00",
     deposit_amount: "0.00",
     expect_amount: "0.00",
@@ -436,16 +437,33 @@ function normalizeOrderProduct(product) {
       };
     });
   }
-  const normalizedBundle = bundleInput.map((item) => ({
-    ...item,
-    bundle_id: item.bundle_id ?? item.id,
-    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
-    bundle_group_id: item.bundle_group_id ?? item.group_id,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
-    price_type: item.price_type ?? item.custom_price_type ?? "",
-    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
-  }));
+  const normalizedBundle = bundleInput.map((item) => {
+    const magnitudeSource = {
+      ...item,
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: item.price ?? item.custom_price
+    };
+    const normalizedItem = {
+      ...item,
+      bundle_id: item.bundle_id ?? item.id,
+      bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+      bundle_group_id: item.bundle_group_id ?? item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
+      price_type: item.price_type ?? item.custom_price_type ?? "",
+      price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
+    };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === "markdown" || normalizedItem.price_type === "markup") && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
+  });
   const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
   const productSku = {

package/lib/solution/VenueBooking/index.js

@@ -1395,7 +1395,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOrderProducts() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.getOrderProducts();
+    const products = this.store.order.getOrderProducts();
+    return products;
   }
   async getSummary() {
     this.logMethodStart("getSummary");

package/package.json

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