@pisell/pisellos 2.3.50 → 2.3.51

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 || {});

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

@@ -9,7 +9,7 @@ import { RequestPlugin, WindowPlugin } from '../../plugins';
 export * from './types';
 import { ProductList } from '../../modules/ProductList';
 import { PaymentModule } from '../../modules/Payment';
-import type { PaymentMethod, RoundingResult, WalletAssetId, WalletAssetsSnapshot, WalletAssetsState, WalletAssetSelectionSource, ScanWalletAssetResult } from '../../modules/Payment/types';
+import type { PaymentMethod, RoundingResult, WalletAssetId, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, WalletAssetSelectionSource, ScanWalletAssetResult } from '../../modules/Payment/types';
 import type { SalesSummaryModule } from '../../modules/SalesSummary';
 import type { ScheduleModule } from '../../modules/Schedule';
 import { QuotationModule } from '../../modules/Quotation';
@@ -333,6 +333,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getWalletAssetsState(): WalletAssetsState;
     /** 导出 Shared Checkout 跨运行时恢复所需的钱包状态与搜索缓存。 */
     exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
+    /** 配置仅影响 Wallet Assets，不改变 Promotion/Voucher 选择流程。 */
+    configureWalletAssetsBehavior(options: WalletAssetsBehaviorOptions): void;
     /**
      * 恢复 Shared Checkout 钱包快照，并把选择重新同步为订单 pending payment。
      */

package/lib/solution/BaseSales/index.js

@@ -2551,6 +2551,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("payment 模块未初始化");
     return this.store.payment.wallet.exportWalletAssetsSnapshot();
   }
+  /** 配置仅影响 Wallet Assets，不改变 Promotion/Voucher 选择流程。 */
+  configureWalletAssetsBehavior(options) {
+    if (!this.store.payment)
+      throw new Error("payment 模块未初始化");
+    this.store.payment.wallet.configureWalletAssetsBehavior(options);
+  }
   /**
    * 恢复 Shared Checkout 钱包快照，并把选择重新同步为订单 pending payment。
    */

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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