@pisell/pisellos 0.10.7 → 0.10.9

package/dist/server/modules/order/types.d.ts

@@ -568,7 +568,7 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh' | 'manual.editOpenRemoteCheck';
 /**
  * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
  * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。

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

@@ -619,7 +619,8 @@ function formatBundlePrice(bundle, currencySymbol) {
   var _ref33, _ref34, _bundle$bundle_sellin;
   var value = (_ref33 = (_ref34 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref34 !== void 0 ? _ref34 : bundle.price) !== null && _ref33 !== void 0 ? _ref33 : 0;
   var amount = new Decimal(toMoneyNumber(value));
-  var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
+  // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
+  var isNegative = bundle.price_type === 'markdown';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
   return formatMoney(amount, currencySymbol);
 }

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

@@ -2,9 +2,9 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 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 { 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';
@@ -109,6 +109,25 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private applyQuotationScheduleResolver;
     private loadQuotationForPriceQuery;
     private getPriceQueryProductId;
+    /**
+   * Change Time / customer reprice 必须沿用商品列表的渠道口径。
+   * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
+   */
+    private getPriceQueryChannel;
+    /**
+     * /product/query 的智能定价评估只读取 strategy_context；
+     * 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;
@@ -156,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>;
@@ -182,7 +204,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 获取附加费用（运费/服务费/税费等）。 */
     getSurcharges(): ISalesSurcharge[];
     getTempOrder(): OrderTempOrder | null;
-    replaceTempOrder(tempOrder: OrderTempOrder): Promise<OrderTempOrder>;
+    replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
     getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
     getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
@@ -208,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;
@@ -218,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[];
@@ -255,6 +282,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    private buildVirtualSettlementSubmitData;
     /**
      * 提交当前 Sales 订单。
      *
@@ -354,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 模块继续保留。 */
@@ -421,9 +454,10 @@ 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): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -439,8 +473,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * @example
      * await baseSales.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: BaseSalesOrderProductIdentity[]): Promise<import("../../modules/Order/types").OrderProduct[]>;
-    removeProductFromOrder(identity: BaseSalesOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    removeProductsFromOrder(identities: BaseSalesOrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    removeProductFromOrder(identity: BaseSalesOrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     /**
      * 注入促销评估器到底层 OrderModule。
      *
@@ -470,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;