@pisell/pisellos 2.2.273 → 2.2.275

package/lib/modules/Rules/index.d.ts

@@ -27,6 +27,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }): {
         isAvailable: boolean;
         discountList: Discount[];
+        /** 完整规则计算后的列表；调用方可用于保留暂时无适用商品的扫码卡券。 */
+        evaluatedDiscountList?: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
     };

package/lib/modules/Rules/index.js

@@ -94,7 +94,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    if (productList.every((item) => {
+    if (productList.length > 0 && productList.every((item) => {
       var _a;
       const product = this.hooks.getProduct(item);
       return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || product.total == 0);
@@ -152,6 +152,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     return {
       isAvailable: hasApplicableDiscount,
       discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
+      evaluatedDiscountList: result.discountList,
       productList: hasApplicableDiscount ? result.productList : productList,
       unavailableReason
     };
@@ -181,9 +182,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getUnavailableReason(discountList, productList) {
     var _a;
     for (const discount of discountList) {
-      for (const item of productList) {
+      const bookingTimes = productList.length ? productList.map((item) => {
         const product = this.hooks.getProduct(item);
-        const bookingTime = ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss");
+        return ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+      }) : [(0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")];
+      for (const bookingTime of bookingTimes) {
         const filteredList = (0, import_utils.filterDiscountListByBookingTime)([discount], bookingTime);
         if (filteredList.length === 0) {
           return import_types.UnavailableReason.TimeLimit;
@@ -238,7 +243,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountType = selectedDiscount.tag || selectedDiscount.type;
       return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
     };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+    const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       var _a2;
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
         return void 0;
@@ -312,6 +317,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
+              // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+              // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+              // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
               id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
@@ -772,13 +780,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
-        } else {
-          processedFlatItemsMap.set(flatItem._id, [
-            {
-              ...flatItem,
-              processed: true
-            }
-          ]);
         }
         return;
       }
@@ -1084,8 +1085,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2);
             reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
             mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
             amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1258,10 +1259,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let targetProductTotal;
           let fixedAmountPerItem;
           let productDiscountDifference;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             fixedAmountPerItem = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(
+              originProduct,
+              selectedDiscount2
+            );
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            targetProductTotal = new import_decimal.default(productOriginTotal).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1283,7 +1293,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id || product.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             metadata: {

package/lib/modules/SalesSummary/utils.js

@@ -99,7 +99,11 @@ function getUnitOriginalTotal(product) {
 function isGeneratedVoucherProduct(product) {
   const record = product;
   const metadata = (record == null ? void 0 : record.metadata) || {};
-  return (record == null ? void 0 : record.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  const isGeneratedChild = metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  if (isGeneratedChild)
+    return true;
+  const isPersisted = (record == null ? void 0 : record.order_detail_id) !== void 0 && (record == null ? void 0 : record.order_detail_id) !== null;
+  return (record == null ? void 0 : record.extension_type) === "product_voucher" && !isPersisted;
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {

package/lib/server/index.d.ts

@@ -498,6 +498,10 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+     */
+    private shouldAutoPrintCheckoutReceipt;
     private shouldBuildSmallTicketData;
     private shouldPrintSyncedOrder;
     private hasPaymentStatus;

package/lib/server/index.js

@@ -65,6 +65,7 @@ var PRODUCT_TITLE_SNAPSHOT_KEYS = [
   "kitchen",
   "original"
 ];
+var AUTO_PRINT_STORAGE_KEY = "auto_print";
 var Server = class {
   constructor(core) {
     this.quotationAvailableCache = /* @__PURE__ */ new Map();
@@ -3698,7 +3699,6 @@ var Server = class {
     });
   }
   async handleOrderCheckoutSubmit(params) {
-    var _a;
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
       backendPath,
@@ -3723,15 +3723,14 @@ var Server = class {
     });
     if ((pendingResult == null ? void 0 : pendingResult.status) === true) {
       const pendingOrder = pendingResult.data;
-      const platform = (_a = this.core.context) == null ? void 0 : _a.getPlatform();
-      const isAndroid = platform === "android";
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && // TODO 这里先加个兼容，如果是安卓，则需要 type=virtual 才走打印，如果是苹果则无限制
-      (isAndroid ? checkoutData.type === "virtual" : true)) {
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
         await this.dispatchLocalReceiptPrint({
           checkoutData,
           order: pendingOrder,
           response: pendingResult,
-          requireFullyPaid: true
+          requireFullyPaid: true,
+          // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
+          isManualPrint: true
         });
       }
       await this.dispatchCheckoutSyncTask({
@@ -3949,6 +3948,15 @@ var Server = class {
       { requireFullyPaid: true, productMap }
     );
   }
+  /**
+   * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+   */
+  shouldAutoPrintCheckoutReceipt() {
+    var _a, _b, _c, _d, _e;
+    if (((_b = (_a = this.core.context) == null ? void 0 : _a.getPlatform) == null ? void 0 : _b.call(_a)) !== "android")
+      return true;
+    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) === "true";
+  }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")
       return false;

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

@@ -14,7 +14,7 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
-export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, RemoteProductMembershipChangedPayload, RemoteProductMembershipChangeSource, } from './order/types';
 export { OrderHooks } from './order/types';
 export { PaymentServerModule } from './payment';
 export type { PaymentMethod, PaymentMethodsChangedEventData, PaymentServerState } from './payment/types';

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

@@ -30,6 +30,10 @@ export declare class OrderModule extends BaseModule implements Module {
      * await this.emitOrdersChanged([freshOrder], 'pubsub.bodyUpsert')
      */
     private emitOrdersChanged;
+    /**
+     * 广播远端商品成员增删。监听器异常必须与订单落库和原有订单广播隔离。
+     */
+    private emitRemoteProductMembershipChanges;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
      * 记录信息日志
@@ -231,6 +235,18 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private getProductMembershipKey;
+    private doProductsHaveStableMembershipIdentity;
+    /**
+     * 冲突提示关注逻辑商品行，而不是服务端 checkout 过程中可能被重建的 detail 记录。
+     * 通用集合合并仍以 order_detail_id 为事实主键；这里只允许相同稳定 UID 跨 detail id 对齐，
+     * 避免本机 checkout 回声被误判成“一删一增”。
+     */
+    private isSameProductMembershipItem;
+    /**
+     * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
+     */
+    private getRemoteProductMembershipChange;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。

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

@@ -89,6 +89,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, payload);
   }
+  /**
+   * 广播远端商品成员增删。监听器异常必须与订单落库和原有订单广播隔离。
+   */
+  async emitRemoteProductMembershipChanges(changes) {
+    for (const payload of changes) {
+      try {
+        await this.core.effects.emit(import_types.OrderHooks.onRemoteProductMembershipChanged, payload);
+      } catch (error) {
+        this.logError("广播远端订单商品成员变更失败", {
+          order_id: payload.order_id,
+          source: payload.source,
+          added_product_count: payload.added_product_keys.length,
+          removed_product_count: payload.removed_product_keys.length,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+  }
   async initialize(core, options) {
     var _a;
     this.core = core;
@@ -314,7 +332,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * const { toWrite, skipped } = this.filterRedundantPatchOrders('pubsub.bodyUpsert', orders, mergeActions)
    */
-  filterRedundantPatchOrders(source, orders, mergeActions) {
+  filterRedundantPatchOrders(source, orders, mergeActions, forceWriteStorageKeys = /* @__PURE__ */ new Set()) {
     const eligibleSkipSources = /* @__PURE__ */ new Set(["pubsub.bodyUpsert", "pubsub.httpRefresh"]);
     if (!eligibleSkipSources.has(source)) {
       return { toWrite: orders, skipped: [] };
@@ -334,6 +352,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         toWrite.push(order);
         continue;
       }
+      if (forceWriteStorageKeys.has(storageKey)) {
+        toWrite.push(order);
+        continue;
+      }
       const recent = this.recentSqliteWriteByStorageKey.get(storageKey);
       if (recent && ORDER_BUSINESS_WRITE_SOURCES.has(recent.source) && now - recent.ts < ORDER_SQLITE_DEDUPE_MS) {
         skipped.push({
@@ -1484,10 +1506,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     this.logDuplicateOrders(`${source}.beforeMerge`, this.store.list);
     const normalizedFreshOrders = [];
+    const incomingProductsHaveStableIdentity = /* @__PURE__ */ new Map();
     for (const order of freshOrders) {
       const id = order == null ? void 0 : order.order_id;
       if (id === void 0 || id === null)
         continue;
+      const rawProducts = order.products;
+      if (Array.isArray(rawProducts)) {
+        const allProductsHaveStableIdentity = this.doProductsHaveStableMembershipIdentity(rawProducts);
+        const orderIdKey = this.getIdKey(id);
+        incomingProductsHaveStableIdentity.set(
+          orderIdKey,
+          (incomingProductsHaveStableIdentity.get(orderIdKey) ?? true) && allProductsHaveStableIdentity
+        );
+      }
       normalizedFreshOrders.push(this.normalizeRemoteSyncedOrder(order));
     }
     const uniqueFreshOrders = this.compactOrderListByIdentity(
@@ -1496,7 +1528,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     ).list;
     const uniqueFreshCount = uniqueFreshOrders.length;
     const patchedOrders = [];
+    const remoteProductMembershipChanges = [];
+    const forceWriteStorageKeys = /* @__PURE__ */ new Set();
     const mergeActions = {};
+    const existingProductsHaveStableIdentity = this.store.list.map(
+      (order) => this.doProductsHaveStableMembershipIdentity(
+        order.products
+      )
+    );
     const updatedList = this.store.list.map(
       (order) => this.normalizeOrderForMemoryList(order, `${source}.existingMemory`)
     );
@@ -1540,6 +1579,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           continue;
         }
         let mergedOrder = this.mergeOrderRecords(existingOrder, fresh);
+        const freshOrderId = fresh.order_id;
+        const incomingProductsAreStable = freshOrderId !== void 0 && freshOrderId !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(freshOrderId)) !== false;
+        let membershipChange = null;
+        if (Array.isArray(fresh.products) && freshOrderId !== void 0 && freshOrderId !== null && existingProductsHaveStableIdentity[matchIndex] !== false && incomingProductsAreStable) {
+          membershipChange = this.getRemoteProductMembershipChange(
+            existingOrder,
+            mergedOrder,
+            source
+          );
+        }
+        let mergedProductsHaveStableIdentity = existingProductsHaveStableIdentity[matchIndex] !== false && incomingProductsAreStable;
         let adjustedMatchIndex = matchIndex;
         const duplicateIndexes = /* @__PURE__ */ new Set();
         for (const key of freshIdentityKeys) {
@@ -1551,7 +1601,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         if (duplicateIndexes.size > 0) {
           for (const duplicateIndex of [...duplicateIndexes].sort((left, right) => right - left)) {
             mergedOrder = this.mergeOrderRecords(mergedOrder, updatedList[duplicateIndex]);
+            mergedProductsHaveStableIdentity = mergedProductsHaveStableIdentity && existingProductsHaveStableIdentity[duplicateIndex] !== false;
             updatedList.splice(duplicateIndex, 1);
+            existingProductsHaveStableIdentity.splice(duplicateIndex, 1);
             if (duplicateIndex < adjustedMatchIndex)
               adjustedMatchIndex -= 1;
           }
@@ -1564,6 +1616,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           }
         }
         updatedList[adjustedMatchIndex] = mergedOrder;
+        existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
+        if (membershipChange) {
+          remoteProductMembershipChanges.push(membershipChange);
+          const mergedStorageKey = this.getOrderStorageKey(mergedOrder);
+          if (mergedStorageKey)
+            forceWriteStorageKeys.add(mergedStorageKey);
+        }
         this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, adjustedMatchIndex);
         patchedOrders.push(mergedOrder);
         if (mergeKey)
@@ -1572,6 +1631,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
       const insertIndex = updatedList.length;
       updatedList.push(fresh);
+      existingProductsHaveStableIdentity.push(
+        fresh.order_id !== void 0 && fresh.order_id !== null && incomingProductsHaveStableIdentity.get(this.getIdKey(fresh.order_id)) !== false
+      );
       this.registerOrderIdentityKeys(identityKeyToIndex, fresh, insertIndex);
       patchedOrders.push(fresh);
       if (mergeKey)
@@ -1586,13 +1648,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     this.store.list = this.runOrderStoreSelfCheck(updatedList, `${source}.store`);
     this.syncOrdersMap();
-    await this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
+    await this.patchOrdersInSQLite(
+      patchedOrders,
+      source,
+      mergeActions,
+      {},
+      forceWriteStorageKeys
+    );
     this.logInfo("mergeOrdersToStore-结束", {
       uniqueFreshCount,
       storeOrderCountAfter: this.store.list.length,
       insertCount,
       updateCount
     });
+    await this.emitRemoteProductMembershipChanges(remoteProductMembershipChanges);
     await this.emitOrdersChanged(patchedOrders, source);
   }
   /**
@@ -1616,6 +1685,72 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isRemoteEchoMergeSource(source) {
     return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
   }
+  getProductMembershipKey(product) {
+    const persistentId = (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("product", product);
+    if (persistentId)
+      return `order_detail_id:${persistentId}`;
+    const uid = (0, import_orderCollectionIdentity.getOrderCollectionUid)("product", product);
+    return uid ? `unique_identification_number:${uid}` : "";
+  }
+  doProductsHaveStableMembershipIdentity(products) {
+    if (!Array.isArray(products))
+      return true;
+    return products.every(
+      (product) => Boolean(
+        (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("product", product) || (0, import_orderCollectionIdentity.getOrderCollectionUid)("product", product)
+      )
+    );
+  }
+  /**
+   * 冲突提示关注逻辑商品行，而不是服务端 checkout 过程中可能被重建的 detail 记录。
+   * 通用集合合并仍以 order_detail_id 为事实主键；这里只允许相同稳定 UID 跨 detail id 对齐，
+   * 避免本机 checkout 回声被误判成“一删一增”。
+   */
+  isSameProductMembershipItem(left, right) {
+    if ((0, import_orderCollectionIdentity.isSameOrderCollectionItem)("product", left, right))
+      return true;
+    const leftUid = (0, import_orderCollectionIdentity.getOrderCollectionUid)("product", left);
+    const rightUid = (0, import_orderCollectionIdentity.getOrderCollectionUid)("product", right);
+    return Boolean(leftUid && rightUid && leftUid === rightUid);
+  }
+  /**
+   * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
+   */
+  getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
+    if (!this.isRemoteEchoMergeSource(source))
+      return null;
+    const previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
+    const currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
+    const unmatchedCurrentIndexes = new Set(currentProducts.map((_, index) => index));
+    const removedProductKeys = [];
+    for (const previousProduct of previousProducts) {
+      const matchedIndex = currentProducts.findIndex(
+        (currentProduct, index) => unmatchedCurrentIndexes.has(index) && this.isSameProductMembershipItem(previousProduct, currentProduct)
+      );
+      if (matchedIndex >= 0) {
+        unmatchedCurrentIndexes.delete(matchedIndex);
+        continue;
+      }
+      const productKey = this.getProductMembershipKey(previousProduct);
+      if (productKey)
+        removedProductKeys.push(productKey);
+    }
+    const addedProductKeys = [...unmatchedCurrentIndexes].map((index) => this.getProductMembershipKey(currentProducts[index])).filter(Boolean);
+    if (addedProductKeys.length === 0 && removedProductKeys.length === 0) {
+      return null;
+    }
+    const orderId = mergedOrder.order_id ?? existingOrder.order_id;
+    if (orderId === void 0 || orderId === null)
+      return null;
+    return {
+      order_id: orderId,
+      source,
+      added_product_keys: addedProductKeys,
+      removed_product_keys: removedProductKeys,
+      previous_product_count: previousProducts.length,
+      current_product_count: currentProducts.length
+    };
+  }
   /**
    * 将订单的全部身份键登记到索引并指向其在列表中的下标。
    * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
@@ -2140,7 +2275,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.patchOrdersInSQLite(freshOrders)
    */
-  async patchOrdersInSQLite(orders, source, mergeActions = {}, options = {}) {
+  async patchOrdersInSQLite(orders, source, mergeActions = {}, options = {}, forceWriteStorageKeys = /* @__PURE__ */ new Set()) {
     if (orders.length === 0) {
       return;
     }
@@ -2156,7 +2291,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const { toWrite, skipped } = this.filterRedundantPatchOrders(
       source,
       ordersSnapshot,
-      mergeActions
+      mergeActions,
+      forceWriteStorageKeys
     );
     if (toWrite.length === 0) {
       return;

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

@@ -568,6 +568,19 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+/**
+ * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
+ * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。
+ */
+export interface RemoteProductMembershipChangedPayload {
+    order_id: OrderId;
+    source: RemoteProductMembershipChangeSource;
+    added_product_keys: string[];
+    removed_product_keys: string[];
+    previous_product_count: number;
+    current_product_count: number;
+}
 /**
  * OrderSyncMessage - pubsub 同步消息结构
  */
@@ -605,5 +618,6 @@ export interface OrderState {
 export declare enum OrderHooks {
     onOrdersLoaded = "order:onOrdersLoaded",
     onOrdersChanged = "order:onOrdersChanged",
+    onRemoteProductMembershipChanged = "order:onRemoteProductMembershipChanged",
     onOrdersSyncCompleted = "order:onOrdersSyncCompleted"
 }

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

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(types_exports);
 var OrderHooks = /* @__PURE__ */ ((OrderHooks2) => {
   OrderHooks2["onOrdersLoaded"] = "order:onOrdersLoaded";
   OrderHooks2["onOrdersChanged"] = "order:onOrdersChanged";
+  OrderHooks2["onRemoteProductMembershipChanged"] = "order:onRemoteProductMembershipChanged";
   OrderHooks2["onOrdersSyncCompleted"] = "order:onOrdersSyncCompleted";
   return OrderHooks2;
 })(OrderHooks || {});