@pisell/pisellos 2.2.198 → 2.2.199

package/lib/modules/Order/utils.js

@@ -44,11 +44,14 @@ __export(utils_exports, {
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
+  getBundleSellingMagnitude: () => getBundleSellingMagnitude,
+  getBundleSignedUnit: () => getBundleSignedUnit,
   getOrderProductLineUid: () => getOrderProductLineUid,
   getProductSkuOptions: () => getProductSkuOptions,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
+  isMarkdownBundle: () => isMarkdownBundle,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
@@ -85,11 +88,10 @@ function composeLinePrice(params) {
   let total = new import_decimal.default(Number(mainPrice) || 0);
   if (Array.isArray(bundle)) {
     for (const item of bundle) {
-      const rawPrice = useOriginalBundle ? (item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price) : (item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price);
-      const price = new import_decimal.default(Number(rawPrice) || 0);
+      const signedUnit = getBundleSignedUnit(item, { useOriginal: useOriginalBundle });
       const rawNum = (item == null ? void 0 : item.num) ?? (item == null ? void 0 : item.quantity) ?? 1;
       const num = new import_decimal.default(Number(rawNum) || 0);
-      total = total.plus(price.times(num));
+      total = total.plus(signedUnit.times(num));
     }
   }
   return total.toDecimalPlaces(2).toFixed(2);
@@ -129,6 +131,33 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function isMarkdownBundle(bundle) {
+  if (!bundle || typeof bundle !== "object")
+    return false;
+  const ext = bundle.price_type_ext ?? bundle.custom_price_type_ext;
+  const type = bundle.price_type ?? bundle.custom_price_type;
+  return type === "markdown" && ext !== "product_price";
+}
+function getBundleSignedUnit(bundle, options) {
+  if (!bundle || typeof bundle !== "object")
+    return new import_decimal.default(0);
+  const useOriginal = (options == null ? void 0 : options.useOriginal) ?? false;
+  if (isMarkdownBundle(bundle)) {
+    const catalog = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.custom_price ?? bundle.base_price ?? bundle.price : bundle.custom_price ?? bundle.product_price ?? bundle.original_price ?? bundle.base_price ?? bundle.price;
+    if (catalog !== void 0 && catalog !== null && catalog !== "") {
+      const raw = new import_decimal.default(Number(catalog) || 0);
+      if (raw.lt(0))
+        return raw;
+      return raw.minus(sumOptionUnitPrice(bundle.option)).negated();
+    }
+    return new import_decimal.default(Number(bundle.bundle_selling_price) || 0).abs().negated();
+  }
+  const rawPrice = useOriginal ? bundle.original_price ?? bundle.product_price ?? bundle.price : bundle.bundle_selling_price ?? bundle.price;
+  return new import_decimal.default(Number(rawPrice) || 0);
+}
+function getBundleSellingMagnitude(bundle) {
+  return getBundleSignedUnit(bundle).abs();
+}
 function resolveRulesManualDiscountFlag(metadata) {
   if (!metadata)
     return void 0;
@@ -472,9 +501,8 @@ function formatSubmitBundleItems(bundle) {
   return bundle.map((b) => {
     const rawBundle = b && typeof b === "object" ? b : {};
     const existedMetadata = rawBundle.metadata && typeof rawBundle.metadata === "object" ? rawBundle.metadata : {};
-    const sellingPrice = toMoneyString(
-      rawBundle.bundle_selling_price ?? rawBundle.price
-    );
+    const sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
+    const paymentPrice = rawBundle.bundle_payment_price !== void 0 && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== "" ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
     const priceValue = rawBundle.price ?? rawBundle.custom_price ?? rawBundle.bundle_selling_price;
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toMoneyString(
@@ -496,6 +524,7 @@ function formatSubmitBundleItems(bundle) {
       price_type: rawBundle.price_type ?? rawBundle.custom_price_type ?? "",
       price_type_ext: rawBundle.price_type_ext ?? rawBundle.custom_price_type_ext ?? "",
       bundle_selling_price: sellingPrice,
+      bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: (rawBundle == null ? void 0 : rawBundle.bundle_group_id) ?? (rawBundle == null ? void 0 : rawBundle.group_id),
       bundle_id: (rawBundle == null ? void 0 : rawBundle.bundle_id) ?? (rawBundle == null ? void 0 : rawBundle.id),
@@ -532,6 +561,9 @@ function normalizeSubmitProduct(product) {
   const priceMetaKeys = [
     "main_product_original_price",
     "main_product_selling_price",
+    "main_product_attached_bundle_selling_price",
+    "main_product_attached_bundle_payment_price",
+    "average_discount_amount_rate",
     "source_product_price",
     "main_product_attached_bundle_surcharge_fee",
     "main_product_attached_bundle_tax_fee",
@@ -566,9 +598,9 @@ function normalizeSubmitProduct(product) {
     discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
-    // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
-    // 新语义下 selling_price 是 composite（含 option/bundle），payment_price 同语义。
-    payment_price: submitProduct.selling_price
+    // 出站兼容：后端消费 payment_price 字段（行 composite 已减整单折扣均摊）。
+    // 由整单折扣均摊层产出；缺省（无折扣）时与 selling_price 同义。
+    payment_price: submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
 var SUBMIT_BOOKING_METADATA_WHITELIST = [
@@ -953,11 +985,14 @@ function indexOrderProductsByUid(products) {
   formatV1Product,
   generateDuration,
   getAllDiscountList,
+  getBundleSellingMagnitude,
+  getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,

package/lib/modules/SalesSummary/utils.js

@@ -78,8 +78,8 @@ function getBundleUnitPrice(product, useOriginal = false) {
   const bundleItems = product.product_bundle || [];
   return bundleItems.reduce((sum, item) => {
     const quantity = getSafeNum(item == null ? void 0 : item.num);
-    const price = useOriginal ? toDecimal((item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price)) : toDecimal((item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price));
-    return sum.plus(price.times(quantity));
+    const signedUnit = (0, import_utils2.getBundleSignedUnit)(item, { useOriginal });
+    return sum.plus(signedUnit.times(quantity));
   }, new import_decimal.default(0));
 }
 function getUnitPaymentTotal(product) {
@@ -607,20 +607,28 @@ function calculateSingleItemTax(params) {
     return new import_decimal.default(0);
   return price.dividedBy(divisor).times(rate);
 }
-function getMainProductPaymentTotal(product) {
+function getMainAttachedBundleSellingTotal(product) {
   var _a, _b;
   const mainSelling = ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0;
   let total = toDecimal(mainSelling);
   const bundleItems = product.product_bundle || [];
   for (const bundleItem of bundleItems) {
     if (isBundleMarkupOrDiscount(bundleItem)) {
-      const unit = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
+      const unit = (0, import_utils2.getBundleSignedUnit)(bundleItem);
       const qty = getSafeNum(bundleItem.num ?? bundleItem.quantity);
       total = total.plus(unit.times(qty));
     }
   }
   return import_decimal.default.max(total, 0);
 }
+function getMainProductPaymentTotal(product) {
+  var _a;
+  const attachedPayment = (_a = product.metadata) == null ? void 0 : _a.main_product_attached_bundle_payment_price;
+  if (attachedPayment !== void 0 && attachedPayment !== null && attachedPayment !== "") {
+    return import_decimal.default.max(toDecimal(attachedPayment), 0);
+  }
+  return getMainAttachedBundleSellingTotal(product);
+}
 function getExplicitTaxRemainder(item) {
   var _a;
   const value = (item == null ? void 0 : item.tax_fee_rounding_remainder) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder);
@@ -805,51 +813,44 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
     originTax: totalOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP)
   };
 }
-function applyShopDiscountToSurchargeBase(products, productAmount, shopDiscountAmount) {
-  if (productAmount.lte(0) || shopDiscountAmount.lte(0))
-    return () => {
-    };
-  const effectiveDiscount = import_decimal.default.min(productAmount, shopDiscountAmount);
-  if (effectiveDiscount.lte(0))
-    return () => {
-    };
-  const snapshots = products.map((product) => {
-    var _a;
-    return {
-      product,
-      metadata: product.metadata,
-      attachedBundleSellingPrice: (_a = product.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price
-    };
-  });
+function allocateShopDiscountToPayment(products, productAmount, shopDiscountAmount) {
+  const effectiveDiscount = productAmount.lte(0) ? new import_decimal.default(0) : import_decimal.default.max(import_decimal.default.min(productAmount, shopDiscountAmount), 0);
   let allocatedDiscount = new import_decimal.default(0);
   products.forEach((product, index) => {
     const quantity = new import_decimal.default(getSafeNum(product.num));
-    const lineAmount = getUnitPaymentTotal(product).times(quantity);
-    const lineDiscount = index === products.length - 1 ? effectiveDiscount.minus(allocatedDiscount) : toAmountFormat(lineAmount.div(productAmount).times(effectiveDiscount));
+    const sellingUnit = getUnitPaymentTotal(product);
+    const lineSellingTotal = sellingUnit.times(quantity);
+    const lineDiscount = effectiveDiscount.lte(0) ? new import_decimal.default(0) : index === products.length - 1 ? import_decimal.default.max(effectiveDiscount.minus(allocatedDiscount), 0) : toAmountFormat(lineSellingTotal.div(productAmount).times(effectiveDiscount));
     allocatedDiscount = allocatedDiscount.plus(lineDiscount);
     const unitDiscount = quantity.lte(0) ? new import_decimal.default(0) : lineDiscount.div(quantity);
-    const currentBase = getMainSurchargeUnitAmount(product);
-    const adjustedBase = import_decimal.default.max(currentBase.minus(unitDiscount), 0);
+    const paymentUnit = import_decimal.default.max(sellingUnit.minus(unitDiscount), 0);
+    const rate = sellingUnit.lte(0) ? new import_decimal.default(1) : toBcScale(paymentUnit.div(sellingUnit), 6);
+    const mainSellingTotal = getMainAttachedBundleSellingTotal(product);
+    const mainPaymentTotal = toAmountFormat(bcMul(mainSellingTotal, rate, 6));
     product.metadata = {
       ...product.metadata || {},
-      main_product_attached_bundle_selling_price: adjustedBase.toFixed(2)
+      average_discount_amount_rate: rate.toString(),
+      main_product_attached_bundle_selling_price: mainSellingTotal.toFixed(2),
+      main_product_attached_bundle_payment_price: mainPaymentTotal.toFixed(2)
     };
-  });
-  return () => {
-    for (const snapshot of snapshots) {
-      if (!snapshot.metadata) {
-        delete snapshot.product.metadata;
+    for (const bundle of product.product_bundle || []) {
+      if (isBundleOriginalPrice(bundle)) {
+        const bundleSelling = toDecimal(
+          bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0
+        );
+        bundle.bundle_payment_price = toAmountFormat(bcMul(bundleSelling, rate, 6)).toFixed(2);
         continue;
       }
-      snapshot.product.metadata = {
-        ...snapshot.product.metadata,
-        main_product_attached_bundle_selling_price: snapshot.attachedBundleSellingPrice
-      };
-      if (snapshot.attachedBundleSellingPrice === void 0) {
-        delete snapshot.product.metadata.main_product_attached_bundle_selling_price;
+      if ((0, import_utils2.isMarkdownBundle)(bundle)) {
+        const magnitude = (0, import_utils2.getBundleSellingMagnitude)(bundle);
+        bundle.custom_price = bundle.custom_price ?? bundle.price;
+        bundle.price = magnitude.toFixed(2);
+        bundle.bundle_selling_price = magnitude.toFixed(2);
+        bundle.bundle_payment_price = toAmountFormat(bcMul(magnitude, rate, 6)).toFixed(2);
       }
     }
-  };
+    product.payment_price = paymentUnit.toFixed(2);
+  });
 }
 function createEmptySalesSummary() {
   return {
@@ -907,12 +908,9 @@ function calculateSalesSummary(params) {
     var _a;
     return (_a = getPersistedMainSurchargeFee(product)) == null ? void 0 : _a.gt(0);
   });
-  const restoreSurchargeBase = hasPersistedSurchargeSnapshot ? () => {
-  } : applyShopDiscountToSurchargeBase(
-    summaryProducts,
-    productAmount,
-    shopDiscountAmount
-  );
+  if (!hasPersistedSurchargeSnapshot) {
+    allocateShopDiscountToPayment(summaryProducts, productAmount, shopDiscountAmount);
+  }
   const surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
   (0, import_utils.getSurcharge)(
     {
@@ -933,7 +931,6 @@ function calculateSalesSummary(params) {
     sourceItems: surchargeServiceItems,
     surchargeList
   });
-  restoreSurchargeBase();
   const surchargeAmount = new import_decimal.default(
     (0, import_utils.getSurchargeAmount)(
       { bookingDetail: null, bookingId: void 0 },

package/lib/server/index.d.ts

@@ -287,6 +287,8 @@ declare class Server {
     private handleOrderSalesCheckout;
     private handleOrderCheckout;
     private handleOrderCheckoutSubmit;
+    private handlePendingSyncCheckoutOrder;
+    private buildPendingSyncCheckoutOrder;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -320,6 +322,7 @@ declare class Server {
     private extractOrderDataFromCheckoutResponse;
     private normalizeCheckoutResponse;
     private extractBackendErrorResponse;
+    private isExplicitBackendErrorResponse;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */

package/lib/server/index.js

@@ -1749,7 +1749,12 @@ var Server = class {
     });
     if (!((_a = this.app) == null ? void 0 : _a.request)) {
       this.logError(`${title}: app.request 不可用`);
-      return { code: 500, status: false, message: "app.request 不可用", data: null };
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: "app.request 不可用"
+      });
     }
     try {
       const response = await this.app.request.post(backendPath, data, {
@@ -1759,7 +1764,8 @@ var Server = class {
       });
       const fresh = this.extractOrderDataFromCheckoutResponse(response);
       if (fresh && this.order) {
-        await this.order.upsertOrdersFromRemote([fresh]);
+        const syncedOrder = { ...fresh, need_sync: 0 };
+        await this.order.upsertOrdersFromRemote([syncedOrder]);
         this.logInfo(`${title}: 订单已同步到本地`, {
           order_id: fresh.order_id,
           external_sale_number: fresh.external_sale_number,
@@ -1778,9 +1784,77 @@ var Server = class {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError)
         return backendError;
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: errorMessage
+      });
+    }
+  }
+  async handlePendingSyncCheckoutOrder(params) {
+    const { backendPath, data, title, reason } = params;
+    const pendingOrder = this.buildPendingSyncCheckoutOrder(data);
+    if (!pendingOrder) {
+      this.logError(`${title}: checkout 失败且订单缺少本地存储标识`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "订单缺少本地存储标识，无法写入待同步队列",
+        data: null
+      };
+    }
+    if (!this.order || typeof this.order.upsertPendingSyncOrders !== "function") {
+      this.logError(`${title}: Order 模块不支持本地待同步写入`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "Order 模块不支持本地待同步写入",
+        data: null
+      };
+    }
+    try {
+      await this.order.upsertPendingSyncOrders([pendingOrder]);
+      this.logWarning(`${title}: 后端未明确报错，订单已写入本地待同步`, {
+        backendPath,
+        reason,
+        order_id: pendingOrder.order_id,
+        external_sale_number: pendingOrder.external_sale_number,
+        order_number: pendingOrder.order_number
+      });
+      return {
+        code: 200,
+        status: true,
+        message: "",
+        data: pendingOrder
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError(`${title}: 写入本地待同步订单失败`, {
+        backendPath,
+        reason,
+        error: errorMessage
+      });
       return { code: 500, status: false, message: errorMessage, data: null };
     }
   }
+  buildPendingSyncCheckoutOrder(data) {
+    if (!data || typeof data !== "object")
+      return null;
+    const hasStorageKey = data.external_sale_number !== void 0 && data.external_sale_number !== null && data.external_sale_number !== "" ? true : data.order_id !== void 0 && data.order_id !== null && data.order_id !== "";
+    if (!hasStorageKey)
+      return null;
+    return {
+      ...data,
+      need_sync: 1
+    };
+  }
   /**
    * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
    * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
@@ -1993,9 +2067,14 @@ var Server = class {
       error == null ? void 0 : error.body
     ];
     return candidates.find(
-      (candidate) => candidate && typeof candidate === "object"
+      (candidate) => this.isExplicitBackendErrorResponse(candidate)
     ) || null;
   }
+  isExplicitBackendErrorResponse(candidate) {
+    if (!candidate || typeof candidate !== "object")
+      return false;
+    return candidate.code !== void 0 || candidate.status !== void 0 || typeof candidate.message === "string";
+  }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
    */

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

@@ -92,6 +92,11 @@ export declare class OrderModule extends BaseModule implements Module {
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
     upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    /**
+     * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+     * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+     */
+    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -172,6 +177,9 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    private isPendingSyncOrder;
+    private normalizeRemoteSyncedOrder;
+    private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
      *

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 | 4 | 5;
+        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?: {