@pisell/pisellos 0.10.8 → 0.10.10

package/lib/modules/SalesSummary/utils.js

@@ -890,13 +890,37 @@ function calculateSalesSummary(params) {
     surchargeList,
     scheduleById = {},
     isInScheduleByDate,
-    shopDiscount
+    shopDiscount,
+    virtualSettlementMode = false
   } = params;
   if (!(products == null ? void 0 : products.length))
     return createEmptySalesSummary();
   const summaryProducts = products.filter((product) => !isGeneratedVoucherProduct(product));
   if (!summaryProducts.length)
     return createEmptySalesSummary();
+  if (virtualSettlementMode) {
+    const productQuantity2 = summaryProducts.reduce(
+      (sum, item) => sum + getSafeNum(item.num),
+      0
+    );
+    const productAmount2 = summaryProducts.reduce(
+      (sum, item) => sum.plus(
+        toDecimal(item.selling_price).times(getSafeNum(item.num))
+      ),
+      new import_decimal.default(0)
+    );
+    const amount = toFixed2(productAmount2);
+    return {
+      ...createEmptySalesSummary(),
+      product_quantity: productQuantity2,
+      product_original_amount: amount,
+      product_amount: amount,
+      product_expect_amount: amount,
+      expect_amount: amount,
+      total_amount: amount,
+      is_price_include_tax: isPriceIncludeTax
+    };
+  }
   const productQuantity = summaryProducts.reduce(
     (sum, item) => sum + getSafeNum(item.num),
     0

package/lib/server/index.d.ts

@@ -263,6 +263,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */
@@ -518,6 +523,10 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+     */
+    private shouldAutoPrintCheckoutReceipt;
     private shouldBuildSmallTicketData;
     private shouldPrintSyncedOrder;
     private hasPaymentStatus;

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");
@@ -65,6 +66,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();
@@ -254,7 +256,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;
     };
@@ -1081,7 +1087,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,
@@ -1089,7 +1100,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
@@ -1103,13 +1113,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,
@@ -2319,16 +2327,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);
     }
@@ -3791,7 +3827,6 @@ var Server = class {
     });
   }
   async handleOrderCheckoutSubmit(params) {
-    var _a;
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
       backendPath,
@@ -3816,10 +3851,7 @@ 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,
@@ -3882,9 +3914,8 @@ var Server = class {
           checkoutData: syncResult.checkoutData,
           order: syncedOrder,
           response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
+          requireFullyPaid: true
           // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-          isManualPrint: true
         });
       }
       return response;
@@ -4054,6 +4085,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)) !== "false";
+  }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")
       return false;

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

@@ -274,6 +274,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;

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

@@ -39,6 +39,7 @@ var import_orderCollectionIdentity = require("../../../modules/Order/utils/order
 var import_types = require("./types");
 var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
+var ORDER_STORAGE_KEY_FIELD = "__order_storage_key";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
 var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2e3;
@@ -1533,6 +1534,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const remoteProductMembershipChanges = [];
     const forceWriteStorageKeys = /* @__PURE__ */ new Set();
+    const storageKeyMigrations = [];
     const mergeActions = {};
     const existingProductsHaveStableIdentity = this.store.list.map(
       (order) => this.doProductsHaveStableMembershipIdentity(
@@ -1557,6 +1559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
+        const previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
         if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
           this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
             source,
@@ -1618,6 +1621,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             }
           }
         }
+        const nextStorageKey = this.getOrderStorageKey(mergedOrder);
+        if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+          storageKeyMigrations.push({
+            orderId: mergedOrder.order_id ?? existingOrder.order_id ?? fresh.order_id ?? null,
+            from: previousStorageKey,
+            to: nextStorageKey
+          });
+        }
         updatedList[adjustedMatchIndex] = mergedOrder;
         existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
         if (membershipChange) {
@@ -1655,7 +1666,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       patchedOrders,
       source,
       mergeActions,
-      {},
+      { storageKeyMigrations },
       forceWriteStorageKeys
     );
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1860,6 +1871,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return "";
   }
+  getPersistedOrderStorageKey(order) {
+    const persistedStorageKey = order == null ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+    if (persistedStorageKey !== void 0 && persistedStorageKey !== null && persistedStorageKey !== "") {
+      return String(persistedStorageKey);
+    }
+    return this.getOrderStorageKey(order);
+  }
   getOrderIdentityMatchKeys(order) {
     return this.getOrderIdentityEntries(order).map((entry) => `${entry.field}:${entry.key}`);
   }
@@ -2290,7 +2308,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
-    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
+    const migrationTargetStorageKeys = new Set(
+      (options.storageKeyMigrations || []).map((migration) => migration.to)
+    );
+    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !migrationTargetStorageKeys.has(storageKey))
+        return order;
+      return {
+        ...order,
+        [ORDER_STORAGE_KEY_FIELD]: storageKey
+      };
+    }).filter((order) => this.getOrderStorageKey(order));
     if (ordersSnapshot.length === 0) {
       return;
     }
@@ -2307,6 +2336,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (compactedToWrite.length === 0) {
       return;
     }
+    const writtenStorageKeys = new Set(
+      compactedToWrite.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    const storageKeyMigrations = /* @__PURE__ */ new Map();
+    for (const migration of options.storageKeyMigrations || []) {
+      if (!writtenStorageKeys.has(migration.to))
+        continue;
+      if (writtenStorageKeys.has(migration.from))
+        continue;
+      storageKeyMigrations.set(migration.from, migration);
+    }
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         let writeMethod = "none";
@@ -2330,6 +2370,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, compactedToWrite);
+        if (writeMethod !== "none") {
+          for (const migration of storageKeyMigrations.values()) {
+            try {
+              await this.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+              this.recentSqliteWriteByStorageKey.delete(migration.from);
+              for (const order of orders) {
+                if (this.getOrderStorageKey(order) !== migration.to)
+                  continue;
+                const orderRecord = order;
+                if (String(orderRecord[ORDER_STORAGE_KEY_FIELD] ?? "") !== migration.from)
+                  continue;
+                orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+              }
+            } catch (error) {
+              this.logError("删除订单旧 SQLite storage key 失败", {
+                source,
+                order_id: migration.orderId,
+                oldStorageKey: migration.from,
+                newStorageKey: migration.to,
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        }
         this.logInfo("patchOrdersInSQLite-完成", {
           source,
           count: compactedToWrite.length,

package/lib/server/utils/small-ticket.js

@@ -562,7 +562,7 @@ function buildOptionTitleSuffix(options) {
 function formatBundlePrice(bundle, currencySymbol) {
   const value = bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0;
   const amount = new import_decimal.default(toMoneyNumber(value));
-  const isNegative = bundle.price_type === "markdown" || bundle.price_type === "markup" && bundle.price_type_ext === "product_price";
+  const isNegative = bundle.price_type === "markdown";
   if (isNegative)
     return `-${currencySymbol}${amount.abs().toFixed(2)}`;
   return formatMoney(amount, currencySymbol);

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

@@ -4,7 +4,7 @@ import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentS
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
-import type { Discount } from '../../modules/Discount/types';
+import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
 export * from './types';
 import { ProductList } from '../../modules/ProductList';
@@ -119,6 +119,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
      */
     private getPriceQueryStrategyContext;
+    /**
+     * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+     */
+    protected prepareProductPriceQueryContext(_customerId?: number | string): Promise<void>;
+    /**
+     * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+     * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+     */
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -166,6 +175,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected setPaymentNumberDevicePrefix(prefix: unknown): void;
     private getPaymentNumberDevicePrefixSync;
     private getPaymentNumberDevicePrefixAsync;
+    private isMultiCurrencySettlementEnabled;
+    private isActiveVirtualSettlementOrder;
+    private isHistoricalVirtualSettlementOrder;
     private syncAppDataToTempOrder;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
@@ -218,6 +230,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
+    /** 切换法币 / WalletPass 单位时清空商品、折扣与支付状态，保留客户。 */
+    clearOrderForSettlementSwitch(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<OrderSummary>;
     private getHistoricalProductDiscountList;
@@ -228,12 +242,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     loadDiscountConfig(params?: {
         customerId?: number;
         action?: 'create' | 'edit';
+        force?: boolean;
     }): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];
         availableWalletIds: number[];
+        virtualCurrencyList: VirtualCurrencyAsset[];
     }>;
     getAvailableWalletIds(): number[];
+    getVirtualCurrencyList(): VirtualCurrencyAsset[];
     bestDiscount(cb?: (result: any) => void): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -265,6 +282,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    private buildVirtualSettlementSubmitData;
     /**
      * 提交当前 Sales 订单。
      *
@@ -364,6 +382,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 模块继续保留。 */
@@ -431,6 +454,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -480,7 +504,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
     /** 最近一次促销计算输出的赠品操作 diff。 */
     getLastGiftActions(): OrderLastGiftActions | null;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<import("../..").ProductData[] | undefined>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;