@pisell/pisellos 2.2.275 → 2.2.277

package/lib/modules/Payment/walletpass.js

@@ -52,6 +52,25 @@ function normalizeWalletAssetCode(code) {
 function getWalletAssetCodeKeys(asset) {
   return [asset == null ? void 0 : asset.code, asset == null ? void 0 : asset.encoded].map(normalizeWalletAssetCode).filter(Boolean);
 }
+function withWalletAssetRecalculationBaseAmount(asset) {
+  const existingBaseAmount = Number(
+    asset == null ? void 0 : asset._wallet_asset_recalculation_base_amount
+  );
+  if (Number.isFinite(existingBaseAmount) && existingBaseAmount >= 0) {
+    return asset;
+  }
+  if (!["product_voucher", "gift_card"].includes(asset == null ? void 0 : asset.tag)) {
+    return asset;
+  }
+  const balanceParValue = Number(asset == null ? void 0 : asset.balance_par_value);
+  if (!Number.isFinite(balanceParValue) || balanceParValue < 0) {
+    return asset;
+  }
+  return {
+    ...asset,
+    _wallet_asset_recalculation_base_amount: balanceParValue
+  };
+}
 function isWalletAssetAvailable(asset) {
   if (!asset)
     return false;
@@ -222,6 +241,42 @@ var WalletPassPaymentImpl = class {
       error: null
     });
   }
+  /**
+   * 搜索接口只返回后端 Wallet Pass 数据，不包含前端策略 config。
+   * 在资产进入共享选择状态前补齐策略结果，避免增量重算回退到接口状态。
+   */
+  formatSearchedWalletPaymentAssets(assets) {
+    var _a, _b, _c, _d;
+    if (!assets.length)
+      return assets;
+    const assetsWithRecalculationBase = assets.map(
+      withWalletAssetRecalculationBaseAmount
+    );
+    const evaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+    if (!(evaluator == null ? void 0 : evaluator.searchVoucherFormat))
+      return assetsWithRecalculationBase;
+    const hasCalculationProducts = this.walletAssetsCalculationContext.products.length > 0;
+    const products = hasCalculationProducts ? this.walletAssetsCalculationContext.products : ((_c = this.walletParams) == null ? void 0 : _c.products) || [];
+    const orderTotalAmount = Number(
+      hasCalculationProducts ? this.walletAssetsCalculationContext.orderTotalAmount : ((_d = this.walletParams) == null ? void 0 : _d.order_wait_pay_amount) || 0
+    );
+    try {
+      const formattedAssets = evaluator.searchVoucherFormat({
+        orderTotalAmount,
+        products,
+        vouchers: assetsWithRecalculationBase
+      });
+      return formattedAssets;
+    } catch (error) {
+      this.paymentModule.logWarning(
+        "[WalletPass] 搜索资产策略格式化失败，保留接口结果",
+        {
+          error: error instanceof Error ? error.message : String(error)
+        }
+      );
+      return assetsWithRecalculationBase;
+    }
+  }
   /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
   getSearchedWalletAssetCodes() {
     const cachedAssets = this.searchResults.filter(isWalletPaymentAsset);
@@ -245,11 +300,23 @@ var WalletPassPaymentImpl = class {
     );
     if (searchedCodeKeys.size === 0)
       return cachedAssets;
+    const cachedAssetByCode = /* @__PURE__ */ new Map();
+    cachedAssets.forEach((item) => {
+      getWalletAssetCodeKeys(item).forEach((code) => {
+        cachedAssetByCode.set(code, item);
+      });
+    });
     const refreshedAssets = refreshedCandidates.filter(
       (item) => isWalletPaymentAsset(item) && searchedCodeKeys.has(
         String((item == null ? void 0 : item.code) || "").trim().toUpperCase()
       )
-    );
+    ).map((item) => {
+      const cachedAsset = getWalletAssetCodeKeys(item).map((code) => cachedAssetByCode.get(code)).find(Boolean);
+      return withWalletAssetRecalculationBaseAmount({
+        ...cachedAsset,
+        ...item
+      });
+    });
     if (refreshedAssets.length > 0) {
       const replacedCodes = new Set(
         refreshedAssets.map(
@@ -321,6 +388,10 @@ var WalletPassPaymentImpl = class {
       payment_order_id
     };
     this.walletParams = walletParams;
+    this.walletAssetsCalculationContext = {
+      orderTotalAmount: Number(walletParams.order_wait_pay_amount || 0),
+      products: Array.isArray(walletParams.products) ? walletParams.products : []
+    };
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
       customer_id: walletParams.customer_id,
       holder_id: walletParams.holder_id,
@@ -472,7 +543,6 @@ var WalletPassPaymentImpl = class {
         vouchers: allList
       });
       const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
       this.walletRecommendList = recommended;
       this.walletInitData = {
         transformList,
@@ -552,7 +622,7 @@ var WalletPassPaymentImpl = class {
       )
     };
     const returnedSelectedKeys = new Set(
-      recalculateList.filter(isWalletAssetAvailable).map((item) => getWalletAssetKey(item))
+      allList.map((item) => getWalletAssetKey(item))
     );
     const authoritativeSelectedIds = selectedIds.filter(
       (id) => returnedSelectedKeys.has(String(id))
@@ -818,6 +888,17 @@ var WalletPassPaymentImpl = class {
       const assetId = getWalletAssetId(asset);
       return assetId !== void 0 && assetId !== null && selectionSources[String(assetId)] === "scan";
     }) : [];
+    const manualEditAmountByKey = /* @__PURE__ */ new Map();
+    if (preserveSelection) {
+      this.walletAssetsState.selectedItems.forEach((asset) => {
+        if (typeof (asset == null ? void 0 : asset.edit_current_amount) !== "number")
+          return;
+        manualEditAmountByKey.set(
+          getWalletAssetKey(asset),
+          asset.edit_current_amount
+        );
+      });
+    }
     if (!((_a = businessData.products) == null ? void 0 : _a.length)) {
       this.queuePendingAutoSelectForAssets(scanSelectedAssets);
       this.generateWalletParams(businessData);
@@ -916,12 +997,16 @@ var WalletPassPaymentImpl = class {
         searchedWalletAssets,
         result.transformList || [],
         result.noApplicableVoucher || []
-      ).map((asset) => ({
-        ...asset,
-        _wallet_asset_recommended: recommendedKeys.has(
-          getWalletAssetKey(asset)
-        )
-      }));
+      ).map((asset) => {
+        const assetKey = getWalletAssetKey(asset);
+        return {
+          ...asset,
+          ...manualEditAmountByKey.has(assetKey) ? {
+            edit_current_amount: manualEditAmountByKey.get(assetKey)
+          } : {},
+          _wallet_asset_recommended: recommendedKeys.has(assetKey)
+        };
+      });
       const latestSelectedIds = preserveSelection ? authoritativeSelectedIds : [];
       const latestSelectionSources = preserveSelection ? { ...this.walletAssetsState.selectionSources } : {};
       const pendingAutoSelectAssets = this.walletAssetsBehavior.autoSelectAfterSearch ? items.filter(
@@ -1035,6 +1120,13 @@ var WalletPassPaymentImpl = class {
       selectionSources: snapshot.state.selectionSources || {}
     });
   }
+  updateWalletAssetEditAmountInCaches(assetKey, amount) {
+    const updateAsset = (asset) => getWalletAssetKey(asset) === assetKey ? { ...asset, edit_current_amount: amount } : asset;
+    this.searchResults = this.searchResults.map(
+      updateAsset
+    );
+    return this.walletAssetsState.items.map(updateAsset);
+  }
   selectWalletAsset(assetId, options) {
     const assetKey = String(assetId);
     const asset = this.walletAssetsState.items.find(
@@ -1050,6 +1142,7 @@ var WalletPassPaymentImpl = class {
     );
     const selectionSources = { ...this.walletAssetsState.selectionSources };
     delete selectionSources[assetKey];
+    let nextItems = this.walletAssetsState.items;
     if (options.selected) {
       if (!asset || !isWalletAssetAvailable(asset)) {
         return this.getWalletAssetsState();
@@ -1058,9 +1151,13 @@ var WalletPassPaymentImpl = class {
       selectionSources[assetKey] = options.source || "manual";
     } else if (asset) {
       this.clearPendingAutoSelectForAsset(asset);
+      nextItems = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
     }
     const nextState = this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      nextItems,
       selectedIds,
       selectionSources
     );
@@ -1069,6 +1166,54 @@ var WalletPassPaymentImpl = class {
     }
     return nextState;
   }
+  /**
+   * 更新已选资产的手动金额。只允许在当前实际抵扣额内向下调整，
+   * 金额为 0 时沿用 legacy 行为取消选择。
+   */
+  updateWalletAssetAmount(assetId, amount) {
+    const assetKey = String(assetId);
+    const committedKeys = new Set(
+      this.walletAssetsState.committedIds.map((id) => String(id))
+    );
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const asset = this.walletAssetsState.items.find(
+      (item) => getWalletAssetKey(item) === assetKey
+    );
+    const requestedAmount = Number(amount);
+    if (!asset || committedKeys.has(assetKey) || !selectedKeys.has(assetKey) || !Number.isFinite(requestedAmount) || requestedAmount < 0) {
+      return this.getWalletAssetsState();
+    }
+    const selectedIds = [...this.walletAssetsState.selectedIds];
+    const selectionSources = { ...this.walletAssetsState.selectionSources };
+    if (requestedAmount === 0) {
+      const nextItems2 = this.updateWalletAssetEditAmountInCaches(
+        assetKey,
+        void 0
+      );
+      delete selectionSources[assetKey];
+      this.clearPendingAutoSelectForAsset(asset);
+      return this.recalculateWalletAssets(
+        nextItems2,
+        selectedIds.filter((id) => String(id) !== assetKey),
+        selectionSources
+      );
+    }
+    const currentDeductionAmount = getWalletAssetDeductionAmount(asset);
+    const editAmount = Math.min(requestedAmount, currentDeductionAmount);
+    if (editAmount <= 0)
+      return this.getWalletAssetsState();
+    const nextItems = this.updateWalletAssetEditAmountInCaches(
+      assetKey,
+      editAmount
+    );
+    return this.recalculateWalletAssets(
+      nextItems,
+      selectedIds,
+      selectionSources
+    );
+  }
   async scanWalletAssetAsync(code) {
     const normalizedCode = String(code || "").trim();
     if (!normalizedCode) {
@@ -1097,7 +1242,15 @@ var WalletPassPaymentImpl = class {
         this.walletAssetsState.selectedItems
       )
     });
-    const paymentAssets = result.data.filter(isWalletPaymentAsset);
+    const paymentAssets = this.formatSearchedWalletPaymentAssets(
+      result.data.filter(isWalletPaymentAsset)
+    );
+    if (paymentAssets.length > 0) {
+      this.searchResults = mergeWalletAssets(
+        this.searchResults,
+        paymentAssets
+      );
+    }
     const asset = paymentAssets.find(
       (item) => String((item == null ? void 0 : item.code) || "") === normalizedCode
     ) || paymentAssets[0];
@@ -1116,30 +1269,44 @@ var WalletPassPaymentImpl = class {
       this.walletAssetsState.selectionSources
     );
     const assetId = getWalletAssetId(asset);
-    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(asset) ? this.selectWalletAsset(assetId, {
+    const recalculatedAsset = assetId === void 0 ? void 0 : recalculatedState.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const selected = this.walletAssetsBehavior.autoSelectAfterSearch && assetId !== void 0 && isWalletAssetAvailable(recalculatedAsset) ? this.selectWalletAsset(assetId, {
       selected: true,
       source: "scan"
     }) : recalculatedState;
     const isSelected = assetId !== void 0 && selected.selectedIds.some((id) => String(id) === String(assetId));
+    const selectedStateAsset = assetId === void 0 ? void 0 : selected.items.find(
+      (item) => getWalletAssetKey(item) === String(assetId)
+    );
+    const resolvedAsset = selectedStateAsset || recalculatedAsset || asset;
     if (isSelected) {
-      this.clearPendingAutoSelectForAsset(asset);
+      this.clearPendingAutoSelectForAsset(resolvedAsset);
     } else if (this.walletAssetsBehavior.autoSelectAfterSearch) {
       this.pendingAutoSelectSearchCodes.add(
         normalizeWalletAssetCode(normalizedCode)
       );
-      this.queuePendingAutoSelectForAssets([asset]);
+      this.queuePendingAutoSelectForAssets([resolvedAsset]);
     }
     return {
       type: result.type,
-      asset,
+      asset: resolvedAsset,
       selected: isSelected,
       state: selected
     };
   }
   clearWalletAssetSelection() {
     this.pendingAutoSelectSearchCodes.clear();
+    const selectedKeys = new Set(
+      this.walletAssetsState.selectedIds.map((id) => String(id))
+    );
+    const clearSelectedEditAmount = (asset) => selectedKeys.has(getWalletAssetKey(asset)) ? { ...asset, edit_current_amount: void 0 } : asset;
+    this.searchResults = this.searchResults.map(
+      clearSelectedEditAmount
+    );
     return this.recalculateWalletAssets(
-      this.walletAssetsState.items,
+      this.walletAssetsState.items.map(clearSelectedEditAmount),
       [],
       {}
     );

package/lib/server/index.d.ts

@@ -253,6 +253,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */

package/lib/server/index.js

@@ -45,6 +45,7 @@ var import_floor_plan = require("./modules/floor-plan");
 var import_types = require("./modules/floor-plan/types");
 var import_payment = require("./modules/payment");
 var import_schedule2 = require("./utils/schedule");
+var import_time = require("./utils/time");
 var import_types2 = require("./modules/products/types");
 var import_product = require("./utils/product");
 var import_order = require("./modules/order");
@@ -247,7 +248,11 @@ var Server = class {
         strategy_context
       });
       if (subscriberId && typeof callback === "function") {
-        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
+        this.syncProductQueryScheduleTimers({
+          subscriberId,
+          menu_list_ids,
+          strategy_context
+        });
       }
       return result;
     };
@@ -1074,7 +1079,12 @@ var Server = class {
         };
       }
       try {
-        const menuList = this.menu.getMenuByIds(menu_list_ids);
+        const {
+          menuList,
+          scheduleIds,
+          scheduleList,
+          timePoints
+        } = this.getMenuScheduleTimePoints(menu_list_ids);
         console.log(`[Server] 找到 ${menuList.length} 个餐牌`);
         this.logInfo("handleGetScheduleTimePoints: 获取到餐牌列表", {
           requestedCount: menu_list_ids.length,
@@ -1082,7 +1092,6 @@ var Server = class {
           menu_list_ids,
           menuList
         });
-        const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
         console.log(`[Server] 提取到 ${scheduleIds.length} 个日程ID:`, scheduleIds);
         this.logInfo("handleGetScheduleTimePoints: 提取到日程 IDs", {
           scheduleCount: scheduleIds.length
@@ -1096,13 +1105,11 @@ var Server = class {
             status: true
           };
         }
-        const scheduleList = this.schedule.getScheduleByIds(scheduleIds);
         console.log(`[Server] 找到 ${scheduleList.length} 个日程`);
         this.logInfo("handleGetScheduleTimePoints: 获取到日程详情", {
           requestedCount: scheduleIds.length,
           foundCount: scheduleList.length
         });
-        const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
         console.log(`[Server] 提取到 ${timePoints.length} 个时间点:`, timePoints);
         this.logInfo("handleGetScheduleTimePoints 处理完成", {
           menuListIdsCount: menu_list_ids.length,
@@ -2264,16 +2271,44 @@ var Server = class {
       });
     }
   }
+  /**
+   * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+   * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+   */
+  getMenuScheduleTimePoints(menuListIds) {
+    var _a, _b;
+    const menuList = ((_a = this.menu) == null ? void 0 : _a.getMenuByIds(menuListIds)) ?? [];
+    const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
+    const scheduleList = scheduleIds.length > 0 ? ((_b = this.schedule) == null ? void 0 : _b.getScheduleByIds(scheduleIds)) ?? [] : [];
+    const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
+    return {
+      menuList,
+      scheduleIds,
+      scheduleList,
+      timePoints
+    };
+  }
   /**
    * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
    */
-  syncProductQueryScheduleTimers(subscriberId, strategy_context) {
+  syncProductQueryScheduleTimers({
+    subscriberId,
+    menu_list_ids,
+    strategy_context
+  }) {
     var _a, _b;
     this.clearSubscriberScheduleTimers(subscriberId);
     if (!this.shouldScheduleProductQueryReload(strategy_context)) {
       return;
     }
-    const timePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const productTimePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const menuListIds = Array.isArray(menu_list_ids) ? Array.from(new Set(
+      menu_list_ids.map((id) => Number(id)).filter((id) => Number.isFinite(id))
+    )) : [];
+    const menuTimePoints = this.getMenuScheduleTimePoints(menuListIds).timePoints;
+    const timePoints = (0, import_time.sortTimePoints)(
+      Array.from(/* @__PURE__ */ new Set([...productTimePoints, ...menuTimePoints]))
+    );
     if (timePoints.length > 0) {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }

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

@@ -355,6 +355,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         selected: boolean;
         source?: WalletAssetSelectionSource;
     }): Promise<WalletAssetsState>;
+    /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
+    updateWalletAssetAmount(params: {
+        assetId: WalletAssetId;
+        amount: number;
+    }): Promise<WalletAssetsState>;
     /** 扫码精确查券；仅可用资产会被自动选中。 */
     scanWalletAsset(code: string): Promise<ScanWalletAssetResult>;
     /** 清空全部未确认钱包选择，已支付钱包项由 Order 模块继续保留。 */

package/lib/solution/BaseSales/index.js

@@ -2638,11 +2638,27 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     await this.syncSelectedWalletAssets(state);
     return this.publishWalletAssetsState(state);
   }
+  /** 更新已选钱包资产的手动使用金额，并同步 pending payment。 */
+  async updateWalletAssetAmount(params) {
+    if (!this.store.payment)
+      throw new Error("payment 模块未初始化");
+    const state = this.store.payment.wallet.updateWalletAssetAmount(
+      params.assetId,
+      params.amount
+    );
+    await this.syncSelectedWalletAssets(state);
+    return this.publishWalletAssetsState(state);
+  }
   /** 扫码精确查券；仅可用资产会被自动选中。 */
   async scanWalletAsset(code) {
     if (!this.store.payment)
       throw new Error("payment 模块未初始化");
-    const result = await this.store.payment.wallet.scanWalletAssetAsync(code);
+    const wallet = this.store.payment.wallet;
+    const businessData = this.buildWalletInitBusinessData();
+    if (businessData) {
+      wallet.generateWalletParams(businessData);
+    }
+    const result = await wallet.scanWalletAssetAsync(code);
     if (result.type === "normalCode") {
       await this.syncSelectedWalletAssets(result.state);
       await this.publishWalletAssetsState(result.state);

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

@@ -217,7 +217,7 @@ function transformBaseProductToOrderProduct(params) {
   }
   const productTitle = {
     ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
-    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+    original: (sourceProduct == null ? void 0 : sourceProduct.original_title) || (sourceProduct == null ? void 0 : sourceProduct.title) || ""
   };
   return {
     product_id: productId,

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 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 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/lib/solution/BookingTicket/index.js

@@ -1568,10 +1568,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
     }
     if (typeof this.store.order.addProductsToOrder === "function") {
-      return this.store.order.addProductsToOrder(orderLines, {
-        skipEditDiscountConfigRefresh: true,
-        skipDiscountRecalculation: true
-      });
+      return this.store.order.addProductsToOrder(orderLines);
     }
     const result = [];
     for (const line of orderLines) {

package/package.json

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