@pisell/pisellos 2.3.36 → 2.3.38

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

@@ -1572,7 +1572,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(draftOrders) {
         var _this10 = this;
-        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex, previousList, removedLegacyMemoryDraft;
+        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, existingOrder, reconciledDraftOrder, mergedOrder, nextOrder, insertIndex, patchedOrders, previousList, removedLegacyMemoryDraft;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1639,7 +1639,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 memoryDraftCount: memoryDraftMap.size,
                 sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
               });
-              patchedOrders = _toConsumableArray(draftMap.values());
               mergeActions = {};
               updatedList = this.store.list.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
@@ -1659,66 +1658,71 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator10 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context13.prev = 37;
+              _context13.prev = 36;
               _iterator10.s();
-            case 39:
+            case 38:
               if ((_step10 = _iterator10.n()).done) {
-                _context13.next = 55;
+                _context13.next = 57;
                 break;
               }
               _step10$value = _slicedToArray(_step10.value, 2), _storageKey2 = _step10$value[0], _draftOrder = _step10$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
               if (!(matchIndex >= 0)) {
-                _context13.next = 49;
+                _context13.next = 51;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], _draftOrder);
+              existingOrder = updatedList[matchIndex];
+              reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, _draftOrder);
+              mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
               nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
                 need_sync: 0,
                 is_draft_order: 1
               });
               updatedList[matchIndex] = nextOrder;
+              // SQLite 必须与内存中的草稿保持同一份 business_code，避免下次 hydrate 再次丢失分类。
+              draftMap.set(_storageKey2, reconciledDraftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context13.abrupt("continue", 53);
-            case 49:
+              return _context13.abrupt("continue", 55);
+            case 51:
               insertIndex = updatedList.length;
               updatedList.push(_draftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
               mergeActions[_storageKey2] = 'insert';
-            case 53:
-              _context13.next = 39;
-              break;
             case 55:
-              _context13.next = 60;
+              _context13.next = 38;
               break;
             case 57:
-              _context13.prev = 57;
-              _context13.t1 = _context13["catch"](37);
+              _context13.next = 62;
+              break;
+            case 59:
+              _context13.prev = 59;
+              _context13.t1 = _context13["catch"](36);
               _iterator10.e(_context13.t1);
-            case 60:
-              _context13.prev = 60;
+            case 62:
+              _context13.prev = 62;
               _iterator10.f();
-              return _context13.finish(60);
-            case 63:
+              return _context13.finish(62);
+            case 65:
+              patchedOrders = _toConsumableArray(draftMap.values());
               previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
               this.syncOrdersMap();
-              _context13.prev = 66;
-              _context13.next = 69;
+              _context13.prev = 69;
+              _context13.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
                 throwOnError: true
               });
-            case 69:
-              _context13.next = 76;
+            case 72:
+              _context13.next = 79;
               break;
-            case 71:
-              _context13.prev = 71;
-              _context13.t2 = _context13["catch"](66);
+            case 74:
+              _context13.prev = 74;
+              _context13.t2 = _context13["catch"](69);
               this.store.list = previousList;
               this.syncOrdersMap();
               throw _context13.t2;
-            case 76:
+            case 79:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
@@ -1727,18 +1731,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return !_this10.shouldKeepOrderInMemory(order);
               });
               if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context13.next = 81;
+                _context13.next = 84;
                 break;
               }
-              _context13.next = 81;
+              _context13.next = 84;
               return this.emitOrdersChanged(patchedOrders.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
               }), 'upsertLocalDraftOrders');
-            case 81:
+            case 84:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[6, 21, 24, 27], [37, 57, 60, 63], [66, 71]]);
+        }, _callee13, this, [[6, 21, 24, 27], [36, 59, 62, 65], [69, 74]]);
       }));
       function upsertLocalDraftOrders(_x10) {
         return _upsertLocalDraftOrders.apply(this, arguments);
@@ -1853,6 +1857,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isBlankIdentityValue(value) {
       return value === undefined || value === null || value === '';
     }
+
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+  }, {
+    key: "preserveExistingBusinessCodeForDraft",
+    value: function preserveExistingBusinessCodeForDraft(existingOrder, draftOrder) {
+      var existingBusinessCode = existingOrder.business_code;
+      var draftBusinessCode = draftOrder.business_code;
+      var hasExistingBusinessCode = typeof existingBusinessCode === 'string' && existingBusinessCode.trim() !== '';
+      var hasDraftBusinessCode = typeof draftBusinessCode === 'string' && draftBusinessCode.trim() !== '';
+      if (!hasExistingBusinessCode || hasDraftBusinessCode) return draftOrder;
+      return _objectSpread(_objectSpread({}, draftOrder), {}, {
+        business_code: existingBusinessCode
+      });
+    }
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
@@ -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 } from '../../modules/Payment/types';
+import type { PaymentMethod, RoundingResult, WalletAssetId, 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';
@@ -48,6 +48,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
     protected cacheId: string | undefined;
+    /**
+     * 由已在初始化阶段解析过设备短号的业务解决方案写入。
+     * 未设置时，支付编号仍按原逻辑实时读取设备信息。
+     */
+    protected paymentNumberDevicePrefix: string | null;
     /**
      * window / request 暴露为 public：现存外部工具（如 BookingTicket Scan）通过
      * `solution.window` / `solution.request` 直接访问插件，保持原有契约不破坏。
@@ -64,6 +69,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private autoPaymentSyncTimer;
     private salesDetailLoadInFlightCount;
     private salesDetailLoadSequence;
+    private walletAssetsRefreshSequence;
     private salesDetailHydrateQueue;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
@@ -141,6 +147,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected readSessionCacheData(): Record<string, any>;
     protected getAppData<T>(key: string): T | undefined;
+    /**
+     * 复用业务解决方案初始化时已解析的支付设备短号。
+     * 空值会清除缓存，使后续支付恢复实时读取设备信息的兼容路径。
+     */
+    protected setPaymentNumberDevicePrefix(prefix: unknown): void;
     private getPaymentNumberDevicePrefixSync;
     private getPaymentNumberDevicePrefixAsync;
     private syncAppDataToTempOrder;
@@ -284,7 +295,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 同步兼容入口。无法等待 IoT 短号时，按调用当下的 device_id 或 LOCAL 生成。
      */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
-    /** 创建新支付项时读取最新设备短号，不缓存运行时设备信息。 */
+    /**
+     * 创建新支付项时优先使用业务解决方案初始化阶段缓存的设备短号；
+     * 未缓存的通用 BaseSales 保持实时读取设备信息的兼容语义。
+     */
     addOrderPaymentAsync(payment: OrderPaymentSource): Promise<OrderPaymentData[]>;
     private addOrderPaymentWithDevicePrefix;
     /** 更新当前订单中的指定支付项。 */
@@ -301,9 +315,38 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     confirmPendingVoucherPayments(): OrderPaymentData[];
     discardPendingVoucherPayments(): OrderPaymentData[];
     private getWalletProductList;
+    private buildWalletInitBusinessData;
     initWalletData(params?: {
         order_wait_pay_amount?: number;
     }): Promise<import("../../modules/Payment").WalletInitializationResult>;
+    private getCommittedWalletAssets;
+    private publishWalletAssetsState;
+    private syncSelectedWalletAssets;
+    /** 读取购物车与 Shared Checkout 共用的钱包资产状态。 */
+    getWalletAssetsState(): WalletAssetsState;
+    /** 导出 Shared Checkout 跨运行时恢复所需的钱包状态与搜索缓存。 */
+    exportWalletAssetsSnapshot(): WalletAssetsSnapshot;
+    /**
+     * 恢复 Shared Checkout 钱包快照，并把选择重新同步为订单 pending payment。
+     */
+    importWalletAssetsSnapshot(snapshot: WalletAssetsSnapshot): Promise<WalletAssetsState>;
+    /**
+     * 基于当前订单快照刷新钱包资产。商品变化保留并重验选择；客户变化强制清空。
+     */
+    refreshWalletAssets(params?: {
+        order_wait_pay_amount?: number;
+        preserveSelection?: boolean;
+    }): Promise<WalletAssetsState>;
+    /** 选择或取消单张钱包资产，并立即同步 pending wallet payments。 */
+    selectWalletAsset(params: {
+        assetId: WalletAssetId;
+        selected: boolean;
+        source?: WalletAssetSelectionSource;
+    }): Promise<WalletAssetsState>;
+    /** 扫码精确查券；仅可用资产会被自动选中。 */
+    scanWalletAsset(code: string): Promise<ScanWalletAssetResult>;
+    /** 清空全部未确认钱包选择，已支付钱包项由 Order 模块继续保留。 */
+    clearWalletAssetSelection(): Promise<WalletAssetsState>;
     /**
      * 更新当前订单客户字段。
      *
@@ -320,16 +363,39 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getPaymentMethodsAsync(): Promise<PaymentMethod[]>;
     /** 同步读取初始化时缓存的支付方式列表。 */
     getPaymentMethods(): PaymentMethod[];
-    /** 轻量舍入能力，供现金支付 UI 计算 rounding_amount。 */
+    private findCashPaymentMethod;
+    private getPendingWalletPaymentAmount;
+    /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
+    getCashPaymentConfig(): Promise<BaseSalesCashPaymentConfig>;
+    /**
+     * 确认足额覆盖订单的 pending Wallet 支付并提交订单。
+     *
+     * Order 模块在构造提交参数时将 pending voucher 转为 paid；只有提交成功后
+     * 才同步 Wallet committed 状态。失败时恢复调用前 payments，允许用户重试。
+     */
+    confirmWalletPayment<T = Record<string, any>>(): Promise<BaseSalesConfirmWalletPaymentResult<T>>;
+    /**
+     * 购物车现金直付：写入现金记录并等待支付同步完成。
+     * 同步失败会恢复调用前 payments（包含 Wallet pending 状态）。
+     */
+    payCash(params: BaseSalesPayCashParams): Promise<BaseSalesPayCashResult>;
+    /**
+     * 提交一次已由支付设备确认成功的非 Wallet 支付。
+     *
+     * 与 addOrderPayment 不同，本入口不会启动后台 fire-and-forget 同步；调用方会等待
+     * 本次 payment、当前 pending Wallet 以及订单提交共同完成。任何同步失败都会恢复
+     * 调用前的 payments 与 payment_status，便于 UI 安全解锁并重试。
+     */
+    commitPaymentMethodPayment(params: BaseSalesCommitPaymentMethodParams): Promise<BaseSalesCommitPaymentMethodResult>;
+    /**
+     * 按当前店铺的现金舍入配置计算金额，供现金支付 UI 使用。
+     *
+     * 舍入开关取自 CASHMANUAL 支付方式；舍入规则取自
+     * otherParams.order_rounding_setting，金额算法统一由 PaymentModule 维护。
+     */
     roundAmount(params: {
         amount: string | number;
-        interval?: string | number;
-        rule?: 'standard_rounding' | 'standard_down' | 'always_up' | 'always_down' | string;
-    }): {
-        originalAmount: string;
-        roundedAmount: string;
-        roundingDifference: string;
-    };
+    }): Promise<RoundingResult>;
     /**
      * 发送支付链接。
      *