@pisell/pisellos 2.3.50 → 2.3.51

package/dist/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/dist/server/modules/order/types.js

@@ -135,6 +135,11 @@
  * const changedOrders = payload.changedOrders
  */
 
+/**
+ * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
+ * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。
+ */
+
 /**
  * OrderSyncMessage - pubsub 同步消息结构
  */
@@ -149,6 +154,7 @@
 export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
   OrderHooks["onOrdersLoaded"] = "order:onOrdersLoaded";
   OrderHooks["onOrdersChanged"] = "order:onOrdersChanged";
+  OrderHooks["onRemoteProductMembershipChanged"] = "order:onRemoteProductMembershipChanged";
   OrderHooks["onOrdersSyncCompleted"] = "order:onOrdersSyncCompleted";
   return OrderHooks;
 }({});

package/dist/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/dist/solution/BaseSales/index.js

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

package/dist/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/dist/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/lib/modules/Order/index.d.ts

@@ -487,7 +487,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Payment/types.d.ts

@@ -397,12 +397,18 @@ export interface WalletAssetsState {
 export interface WalletAssetsSnapshot {
     state: WalletAssetsState;
     searchResults: SearchIdentificationCodeItem[];
+    /** 已搜索但尚未满足订单条件、等待首次可用后自动选中的 Wallet Asset code。 */
+    pendingAutoSelectSearchCodes?: string[];
     walletParams: WalletDeductionRecommendParams | null;
     calculationContext: {
         orderTotalAmount: number;
         products: any[];
     };
 }
+export interface WalletAssetsBehaviorOptions {
+    /** 搜索到 Wallet Asset 后，当前或后续首次可用时是否自动选中。 */
+    autoSelectAfterSearch?: boolean;
+}
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
@@ -472,6 +478,8 @@ export interface WalletPassPayment {
     refreshWalletAssetsFromBusinessAsync: (businessData: WalletInitBusinessData, options?: RefreshWalletAssetsOptions) => Promise<WalletAssetsState>;
     /** 获取共享钱包资产状态快照。 */
     getWalletAssetsState: () => WalletAssetsState;
+    /** 配置仅影响 Wallet Assets 的交互行为。 */
+    configureWalletAssetsBehavior: (options: WalletAssetsBehaviorOptions) => void;
     /** 导出供 Shared Checkout 跨运行时传递的 Wallet Assets 快照。 */
     exportWalletAssetsSnapshot: () => WalletAssetsSnapshot;
     /** 恢复 Shared Checkout 传回的 Wallet Assets 快照。 */

package/lib/modules/Payment/walletpass.d.ts

@@ -1,4 +1,4 @@
-import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
+import { WalletPassPayment, WalletDeductionRecommendParams, WalletRecommendItem, UserIdentificationCodeParams, UserIdentificationCodeItem, SearchIdentificationCodeParams, SearchIdentificationCodeItem, SearchIdentificationCodeResult, WalletInitBusinessData, WalletAssetId, WalletAssetsBehaviorOptions, WalletAssetsSnapshot, WalletAssetsState, RefreshWalletAssetsOptions, SelectWalletAssetOptions, ScanWalletAssetResult } from './types';
 import type { PaymentModule } from './index';
 /**
  * 钱包支付实现
@@ -12,8 +12,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private walletInitData;
     private walletAssetsState;
     private walletAssetsRequestSequence;
+    private walletAssetsBehavior;
+    private pendingAutoSelectSearchCodes;
     private walletAssetsCalculationContext;
     constructor(paymentModule: PaymentModule);
+    configureWalletAssetsBehavior(options: WalletAssetsBehaviorOptions): void;
     /**
      * 发送事件的辅助方法
      * 支持使用WalletPassHooks或PaymentHooks
@@ -28,6 +31,9 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
      */
     private syncSearchedWalletAssets;
+    private isPendingAutoSelectAsset;
+    private clearPendingAutoSelectForAsset;
+    private queuePendingAutoSelectForAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中

package/lib/modules/Payment/walletpass.js

@@ -46,6 +46,12 @@ function matchesWalletAssetCode(asset, normalizedCode) {
     (identifier) => String(identifier ?? "").trim() === normalizedCode
   );
 }
+function normalizeWalletAssetCode(code) {
+  return String(code ?? "").trim().toUpperCase();
+}
+function getWalletAssetCodeKeys(asset) {
+  return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -107,11 +113,23 @@ var WalletPassPaymentImpl = class {
     this.walletInitData = null;
     this.walletAssetsState = createInitialWalletAssetsState();
     this.walletAssetsRequestSequence = 0;
+    this.walletAssetsBehavior = {
+      autoSelectAfterSearch: true
+    };
+    this.pendingAutoSelectSearchCodes = /* @__PURE__ */ new Set();
     this.walletAssetsCalculationContext = {
       orderTotalAmount: 0,
       products: []
     };
   }
+  configureWalletAssetsBehavior(options) {
+    if (options.autoSelectAfterSearch === void 0)
+      return;
+    this.walletAssetsBehavior.autoSelectAfterSearch = options.autoSelectAfterSearch;
+    if (!options.autoSelectAfterSearch) {
+      this.pendingAutoSelectSearchCodes.clear();
+    }
+  }
   /**
    * 发送事件的辅助方法
    * 支持使用WalletPassHooks或PaymentHooks
@@ -250,6 +268,25 @@ var WalletPassPaymentImpl = class {
       refreshedAssets
     );
   }
+  isPendingAutoSelectAsset(asset) {
+    return getWalletAssetCodeKeys(asset).some(
+      (code) => this.pendingAutoSelectSearchCodes.has(code)
+    );
+  }
+  clearPendingAutoSelectForAsset(asset) {
+    getWalletAssetCodeKeys(asset).forEach((code) => {
+      this.pendingAutoSelectSearchCodes.delete(code);
+    });
+  }
+  queuePendingAutoSelectForAssets(assets) {
+    if (!this.walletAssetsBehavior.autoSelectAfterSearch)
+      return;
+    assets.forEach((asset) => {
+      getWalletAssetCodeKeys(asset).forEach((code) => {
+        this.pendingAutoSelectSearchCodes.add(code);
+      });
+    });
+  }
   /**
    * 生成钱包API默认参数
    * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -777,7 +814,12 @@ var WalletPassPaymentImpl = class {
     );
     const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
     const selectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
+    const scanSelectedAssets = preserveSelection ? this.walletAssetsState.selectedItems.filter((asset) => {
+      const assetId = getWalletAssetId(asset);
+      return assetId !== void 0 && assetId !== null && selectionSources[String(assetId)] === "scan";
+    }) : [];
     if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
+      this.queuePendingAutoSelectForAssets(scanSelectedAssets);
       this.generateWalletParams(businessData);
       const restoredSearchedAssets = this.searchResults.filter(isWalletPaymentAsset).map((item) => ({
         ...item,
@@ -882,11 +924,43 @@ var WalletPassPaymentImpl = class {
       }));
       const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
-      return this.recalculateWalletAssets(
+      const pendingAutoSelectAssets = this.walletAssetsBehavior.autoSelectAfterSearch ? items.filter(
+        (asset) => this.isPendingAutoSelectAsset(asset) && isWalletAssetAvailable(asset)
+      ) : [];
+      const requestedKeySet = new Set(
+        latestSelectedIds.map((id) => String(id))
+      );
+      pendingAutoSelectAssets.forEach((asset) => {
+        const assetId = getWalletAssetId(asset);
+        if (assetId === void 0 || assetId === null)
+          return;
+        const assetKey = String(assetId);
+        if (!requestedKeySet.has(assetKey)) {
+          requestedKeySet.add(assetKey);
+          latestSelectedIds.push(assetId);
+        }
+        latestSelectionSources[assetKey] = "scan";
+      });
+      const nextState = this.recalculateWalletAssets(
         items,
         latestSelectedIds,
         latestSelectionSources
       );
+      const selectedKeySet = new Set(
+        nextState.selectedIds.map((id) => String(id))
+      );
+      pendingAutoSelectAssets.forEach((asset) => {
+        const assetId = getWalletAssetId(asset);
+        if (assetId !== void 0 && assetId !== null && selectedKeySet.has(String(assetId))) {
+          this.clearPendingAutoSelectForAsset(asset);
+        }
+      });
+      const droppedScanSelectedAssets = scanSelectedAssets.filter((asset) => {
+        const assetId = getWalletAssetId(asset);
+        return assetId !== void 0 && assetId !== null && !selectedKeySet.has(String(assetId));
+      });
+      this.queuePendingAutoSelectForAssets(droppedScanSelectedAssets);
+      return nextState;
     } catch (error) {
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
@@ -926,6 +1000,9 @@ var WalletPassPaymentImpl = class {
     return {
       state: this.getWalletAssetsState(),
       searchResults: [...this.searchResults],
+      pendingAutoSelectSearchCodes: [
+        ...this.pendingAutoSelectSearchCodes
+      ],
       walletParams: this.walletParams ? { ...this.walletParams } : null,
       calculationContext: {
         orderTotalAmount: this.walletAssetsCalculationContext.orderTotalAmount,
@@ -939,6 +1016,9 @@ var WalletPassPaymentImpl = class {
       return this.getWalletAssetsState();
     this.walletAssetsRequestSequence += 1;
     this.searchResults = Array.isArray(snapshot.searchResults) ? [...snapshot.searchResults] : [];
+    this.pendingAutoSelectSearchCodes = this.walletAssetsBehavior.autoSelectAfterSearch && Array.isArray(snapshot.pendingAutoSelectSearchCodes) ? new Set(
+      snapshot.pendingAutoSelectSearchCodes.map(normalizeWalletAssetCode).filter(Boolean)
+    ) : /* @__PURE__ */ new Set();
     this.walletParams = snapshot.walletParams ? { ...snapshot.walletParams } : null;
     this.walletAssetsCalculationContext = {
       orderTotalAmount: Number(
@@ -957,6 +1037,9 @@ var WalletPassPaymentImpl = class {
   }
   selectWalletAsset(assetId, options) {
     const assetKey = String(assetId);
+    const asset = this.walletAssetsState.items.find(
+      (item) => getWalletAssetKey(item) === assetKey
+    );
     const committedKeys = new Set(
       this.walletAssetsState.committedIds.map((id) => String(id))
     );
@@ -968,20 +1051,23 @@ var WalletPassPaymentImpl = class {
     const selectionSources = { ...this.walletAssetsState.selectionSources };
     delete selectionSources[assetKey];
     if (options.selected) {
-      const asset = this.walletAssetsState.items.find(
-        (item) => getWalletAssetKey(item) === assetKey
-      );
       if (!asset || !isWalletAssetAvailable(asset)) {
         return this.getWalletAssetsState();
       }
       selectedIds.push(assetId);
       selectionSources[assetKey] = options.source || "manual";
+    } else if (asset) {
+      this.clearPendingAutoSelectForAsset(asset);
     }
-    return this.recalculateWalletAssets(
+    const nextState = this.recalculateWalletAssets(
       this.walletAssetsState.items,
       selectedIds,
       selectionSources
     );
+    if (options.selected && asset && nextState.selectedIds.some((id) => String(id) === assetKey)) {
+      this.clearPendingAutoSelectForAsset(asset);
+    }
+    return nextState;
   }
   async scanWalletAssetAsync(code) {
     const normalizedCode = String(code || "").trim();
@@ -1024,24 +1110,34 @@ var WalletPassPaymentImpl = class {
       };
     }
     const items = mergeWalletAssets(this.walletAssetsState.items, [asset]);
-    this.recalculateWalletAssets(
+    const recalculatedState = this.recalculateWalletAssets(
       items,
       this.walletAssetsState.selectedIds,
       this.walletAssetsState.selectionSources
     );
     const assetId = getWalletAssetId(asset);
-    const selected = assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
       selected: true,
       source: "scan"
-    }) : this.getWalletAssetsState();
+    }) : recalculatedState;
+    const isSelected = assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId));
+    if (isSelected) {
+      this.clearPendingAutoSelectForAsset(asset);
+    } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
+      this.pendingAutoSelectSearchCodes.add(
+        normalizeWalletAssetCode(normalizedCode)
+      );
+      this.queuePendingAutoSelectForAssets([asset]);
+    }
     return {
       type: result.type,
       asset,
-      selected: assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId)),
+      selected: isSelected,
       state: selected
     };
   }
   clearWalletAssetSelection() {
+    this.pendingAutoSelectSearchCodes.clear();
     return this.recalculateWalletAssets(
       this.walletAssetsState.items,
       [],
@@ -1156,6 +1252,7 @@ var WalletPassPaymentImpl = class {
    */
   clearSearchResults() {
     this.searchResults = [];
+    this.pendingAutoSelectSearchCodes.clear();
     this.paymentModule.logInfo("[WalletPass] 搜索结果缓存已清除");
   }
   /**
@@ -1178,6 +1275,7 @@ var WalletPassPaymentImpl = class {
     this.walletRecommendList = [];
     this.userIdentificationCodes = [];
     this.searchResults = [];
+    this.pendingAutoSelectSearchCodes.clear();
     this.walletParams = null;
     this.walletInitData = null;
     this.walletAssetsRequestSequence += 1;

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）也会被登记。