@pisell/pisellos 0.10.56 → 0.10.57

package/lib/shared/receipt/templateVisibility.d.ts

@@ -0,0 +1,23 @@
+/** Template children are direct module members; legacy missing values stay visible. */
+export interface InvoiceDataVisibility {
+    handover: {
+        show: boolean;
+        method: boolean;
+        fulfillmentTime: boolean;
+    };
+    customer: {
+        show: boolean;
+        name: boolean;
+        email: boolean;
+        phone: boolean;
+    };
+    card: {
+        show: boolean;
+        passTypes: ReadonlySet<string> | null;
+    };
+}
+export declare function invoiceSettingIsVisible(value: unknown): boolean;
+export declare function getInvoiceTemplateModules(settings: unknown): Record<string, any>[];
+export declare function resolveInvoiceDataVisibility(settings: unknown): InvoiceDataVisibility;
+/** Whether an old unfiltered snapshot is unsafe for this template. */
+export declare function requiresInvoiceDataFiltering(settings: unknown): boolean;

package/lib/shared/receipt/templateVisibility.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInvoiceTemplateModules = getInvoiceTemplateModules;
+exports.invoiceSettingIsVisible = invoiceSettingIsVisible;
+exports.requiresInvoiceDataFiltering = requiresInvoiceDataFiltering;
+exports.resolveInvoiceDataVisibility = resolveInvoiceDataVisibility;
+/** Template children are direct module members; legacy missing values stay visible. */
+
+function invoiceSettingIsVisible(value) {
+  return value !== 0 && value !== false;
+}
+function getInvoiceTemplateModules(settings) {
+  if (Array.isArray(settings)) return settings.filter(isRecord);
+  if (!isRecord(settings)) return [];
+  if (isRecord(settings.template_settings)) {
+    return getInvoiceTemplateModules(settings.template_settings);
+  }
+  const modules = settings.modules ?? settings.module;
+  return Array.isArray(modules) ? modules.filter(isRecord) : [];
+}
+function isRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function resolveInvoiceDataVisibility(settings) {
+  const modules = getInvoiceTemplateModules(settings);
+  // Native templates use the first occurrence of each module.
+  const module = key => modules.find(item => item.key === key);
+  const handover = module('handover');
+  const customer = module('customer');
+  const card = module('card');
+  const field = (config, key) => invoiceSettingIsVisible(config?.[key]?.is_show);
+  const passTypes = Array.isArray(card?.pass_type) && card.pass_type.length > 0 ? new Set(card.pass_type.filter(tag => typeof tag === 'string' && tag.length > 0)) : null;
+  return {
+    handover: {
+      show: invoiceSettingIsVisible(handover?.is_show),
+      method: field(handover, 'method'),
+      fulfillmentTime: field(handover, 'fulfillment_time')
+    },
+    customer: {
+      show: invoiceSettingIsVisible(customer?.is_show),
+      name: field(customer, 'name'),
+      email: field(customer, 'email'),
+      phone: field(customer, 'phone')
+    },
+    card: {
+      show: invoiceSettingIsVisible(card?.is_show),
+      passTypes
+    }
+  };
+}
+
+/** Whether an old unfiltered snapshot is unsafe for this template. */
+function requiresInvoiceDataFiltering(settings) {
+  const {
+    handover,
+    customer,
+    card
+  } = resolveInvoiceDataVisibility(settings);
+  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+}

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesSubmitSalesOrderParams, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesSubmitSalesOrderParams, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentOptions, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
 import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
@@ -74,6 +74,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private walletAssetsRefreshSequence;
     private salesDetailHydrateQueue;
     private serverOrderChangeUnsubscribe;
+    private paymentMethodsChangedUnsubscribe;
     private serverOrderChangeHydrateInFlight;
     private queuedServerOrderChanges;
     private serverOrderChangeSyncEnabled;
@@ -105,6 +106,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private drainQueuedServerOrderChanges;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
+    private registerPaymentMethodsChangeSync;
     private hydrateLatestLoadedSalesDetail;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
@@ -462,7 +464,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private findCashPaymentMethod;
     private getPendingWalletPaymentAmount;
     /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
-    getCashPaymentConfig(): Promise<BaseSalesCashPaymentConfig>;
+    getCashPaymentConfig(options?: BaseSalesCashPaymentOptions): Promise<BaseSalesCashPaymentConfig>;
     /**
      * 确认足额覆盖订单的 pending Wallet 支付并提交订单。
      *

package/lib/solution/BaseSales/index.js

@@ -39,6 +39,7 @@ var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductT
 var _quotationPrice = require("./utils/quotationPrice");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SERVER_ORDER_CHANGED_EVENT = 'order:onOrdersChanged';
+const PAYMENT_METHODS_CHANGED_EVENT = 'payment:onPaymentMethodsChanged';
 const OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 const OS_INVOICE_LAYOUT_CONFIG_FIELD = '_os_invoice_layout_config';
 const OS_INVOICE_TEMPLATE_SETTINGS_FIELD = '_os_invoice_template_settings';
@@ -496,6 +497,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   walletAssetsRefreshSequence = 0;
   salesDetailHydrateQueue = Promise.resolve();
   serverOrderChangeUnsubscribe = null;
+  paymentMethodsChangedUnsubscribe = null;
   serverOrderChangeHydrateInFlight = null;
   queuedServerOrderChanges = [];
   serverOrderChangeSyncEnabled = false;
@@ -641,6 +643,15 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
+  registerPaymentMethodsChangeSync() {
+    this.paymentMethodsChangedUnsubscribe?.();
+    const effects = this.core?.effects;
+    if (!effects || typeof effects.on !== 'function') return;
+    this.paymentMethodsChangedUnsubscribe = effects.on(PAYMENT_METHODS_CHANGED_EVENT, async payload => {
+      if (!Array.isArray(payload?.newMethods)) return;
+      await this.getPaymentMethodsAsync();
+    });
+  }
   async hydrateLatestLoadedSalesDetail(record, loadSequence, options) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
@@ -1405,9 +1416,22 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
   syncAppDataToTempOrder(tempOrder) {
     const isPriceIncludeTax = this.getAppData('is_price_include_tax');
-    const taxCountryCode = this.getAppData('tax_country_code');
-    const currencyCode = this.getAppData('shop_currency_code');
-    const currencySymbol = this.getAppData('shop_symbol');
+    const rawTaxCountryCode = this.getAppData('tax_country_code');
+    const rawCurrencyCode = this.getAppData('shop_currency_code');
+    const rawCurrencySymbol = this.getAppData('shop_symbol');
+    const normalizeNonBlankValue = value => {
+      if (value === undefined || value === null) return undefined;
+      const normalizedValue = String(value).trim();
+      return normalizedValue || undefined;
+    };
+    const taxCountryCode = normalizeNonBlankValue(rawTaxCountryCode);
+    const currencyCode = normalizeNonBlankValue(rawCurrencyCode);
+    const currencySymbol = normalizeNonBlankValue(rawCurrencySymbol);
+    const before = {
+      tax_country_code: tempOrder.tax_country_code,
+      currency_code: tempOrder.currency_code,
+      currency_symbol: tempOrder.currency_symbol
+    };
     // 历史虚拟币订单不依赖交易开关；普通 POS 不从商品行残留快照推断订单币种。
     const isHistoricalVirtualSettlement = this.isHistoricalVirtualSettlementOrder(tempOrder);
     const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder) || isHistoricalVirtualSettlement;
@@ -1421,9 +1445,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
     }
     if (taxCountryCode !== undefined) {
-      const nextTaxCountryCode = String(taxCountryCode || '');
-      if (tempOrder.tax_country_code !== nextTaxCountryCode) {
-        tempOrder.tax_country_code = nextTaxCountryCode;
+      if (tempOrder.tax_country_code !== taxCountryCode) {
+        tempOrder.tax_country_code = taxCountryCode;
         isChanged = true;
       }
     }
@@ -1440,19 +1463,45 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
     }
     if (!isVirtualSettlement && currencyCode !== undefined) {
-      const nextCurrencyCode = String(currencyCode || '');
-      if (tempOrder.currency_code !== nextCurrencyCode) {
-        tempOrder.currency_code = nextCurrencyCode;
+      if (tempOrder.currency_code !== currencyCode) {
+        tempOrder.currency_code = currencyCode;
         isChanged = true;
       }
     }
     if (!isVirtualSettlement && currencySymbol !== undefined) {
-      const nextCurrencySymbol = String(currencySymbol || '');
-      if (tempOrder.currency_symbol !== nextCurrencySymbol) {
-        tempOrder.currency_symbol = nextCurrencySymbol;
+      if (tempOrder.currency_symbol !== currencySymbol) {
+        tempOrder.currency_symbol = currencySymbol;
         isChanged = true;
       }
     }
+    try {
+      const orderIdentity = this.store.order?.getOrderIdentity?.();
+      this.logger?.addLog?.({
+        type: 'info',
+        title: 'syncAppDataToTempOrder',
+        metadata: {
+          moduleName: this.name,
+          cacheId: this.cacheId,
+          orderId: orderIdentity?.orderId ?? tempOrder.order_id,
+          externalSaleNumber: orderIdentity?.externalSaleNumber ?? tempOrder.external_sale_number,
+          shopOrderNumber: orderIdentity?.shopOrderNumber ?? tempOrder.shop_order_number,
+          readValues: {
+            tax_country_code: rawTaxCountryCode,
+            shop_currency_code: rawCurrencyCode,
+            shop_symbol: rawCurrencySymbol
+          },
+          before,
+          after: {
+            tax_country_code: tempOrder.tax_country_code,
+            currency_code: tempOrder.currency_code,
+            currency_symbol: tempOrder.currency_symbol
+          },
+          isChanged
+        }
+      });
+    } catch {
+      // 诊断日志不能影响订单字段同步。
+    }
     return isChanged;
   }
   async initialize(core, options = {}) {
@@ -1504,6 +1553,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
     }
     await this.getPaymentMethodsAsync();
+    this.registerPaymentMethodsChangeSync();
     this.registerServerOrderChangeSync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
@@ -1511,6 +1561,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     this.resetPickupTimingCache();
     this.serverOrderChangeUnsubscribe?.();
     this.serverOrderChangeUnsubscribe = null;
+    this.paymentMethodsChangedUnsubscribe?.();
+    this.paymentMethodsChangedUnsubscribe = null;
     Object.keys(this.store).forEach(key => {
       if (this.reusedSharedSubModuleNames.has(key)) return;
       const sub = this.store[key];
@@ -3417,10 +3469,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   getPaymentMethods() {
     return [...this.paymentMethodsCache];
   }
-  findCashPaymentMethod(paymentMethods) {
+  findCashPaymentMethod(paymentMethods, paymentMethodId) {
     return paymentMethods.find(method => {
+      if (method?.enabled === false || method?.enable === false) return false;
       const identifiers = [method?.code, method?.type, method?.tag].map(value => String(value || '').toUpperCase());
-      return identifiers.includes('CASHMANUAL') && method?.enabled !== false && method?.enable !== false;
+      const isDefaultCash = identifiers.includes('CASHMANUAL');
+      if (paymentMethodId === undefined) return isDefaultCash;
+      const isCustomCash = String(method?.type || '').trim().toLowerCase() === 'custom' && [method?.name, method?.nameEn].some(name => typeof name === 'string' && /现金|現金|cash/i.test(name));
+      return String(method?.id) === String(paymentMethodId) && (isDefaultCash || isCustomCash);
     });
   }
   getPendingWalletPaymentAmount(payments = this.store.order?.getOrderPayments?.() || []) {
@@ -3437,13 +3493,16 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
 
   /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
-  async getCashPaymentConfig() {
+  async getCashPaymentConfig(options = {}) {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     let paymentMethods = this.getPaymentMethods();
-    let paymentMethod = this.findCashPaymentMethod(paymentMethods);
+    let paymentMethod = this.findCashPaymentMethod(paymentMethods, options.paymentMethodId);
     if (!paymentMethod) {
       paymentMethods = await this.getPaymentMethodsAsync();
-      paymentMethod = this.findCashPaymentMethod(paymentMethods);
+      paymentMethod = this.findCashPaymentMethod(paymentMethods, options.paymentMethodId);
+    }
+    if (!paymentMethod && options.paymentMethodId !== undefined) {
+      throw new Error(`未找到可用的现金支付方式：${options.paymentMethodId}`);
     }
     const amountSnapshot = this.store.order?.getOrderAmountSnapshot?.();
     const pendingWalletAmount = this.getPendingWalletPaymentAmount();
@@ -3541,7 +3600,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!Number.isFinite(amount) || amount <= 0) {
       throw new Error('现金支付金额必须大于 0');
     }
-    const config = await this.getCashPaymentConfig();
+    const config = params.paymentMethodId === undefined ? await this.getCashPaymentConfig() : await this.getCashPaymentConfig({
+      paymentMethodId: params.paymentMethodId
+    });
     const paymentMethod = config.paymentMethod;
     if (!paymentMethod) throw new Error('未找到可用的 CASHMANUAL 支付方式');
     if (config.amountDue <= 0) throw new Error('当前订单没有待支付金额');

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

@@ -25,6 +25,10 @@ export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSales
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | string;
+export interface BaseSalesCashPaymentOptions {
+    /** 指定现金支付方式；省略时使用默认 CASHMANUAL。 */
+    paymentMethodId?: number | string;
+}
 export interface BaseSalesSubmitSalesOrderParams {
     payments?: OrderPaymentSource[];
     paymentStatus?: BaseSalesPaymentStatus;
@@ -40,7 +44,7 @@ export interface BaseSalesCashPaymentConfig {
     amountDue: number;
     recommendedAmounts: number[];
 }
-export interface BaseSalesPayCashParams {
+export interface BaseSalesPayCashParams extends BaseSalesCashPaymentOptions {
     /** 实际计入订单的现金支付金额（部分支付时小于待付金额）。 */
     amount: number;
     /** 顾客实际交付现金；可大于 amount。 */

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
+var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
 var _utils = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
@@ -65,11 +66,11 @@ function appendDataVariantIds(base, ...values) {
   }
   return Array.isArray(base) || result.length ? result : undefined;
 }
-function normalizeOptionItems(optionItems) {
+function normalizeOptionItems(optionItems, useOriginalPrice = false) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(optionItem => {
     const optionGroupItemId = toNumber(optionItem?.option_group_item_id ?? optionItem?.id);
-    const price = optionItem?.price ?? optionItem?.add_price ?? 0;
+    const price = (useOriginalPrice ? optionItem?.original_price : undefined) ?? optionItem?.price ?? optionItem?.add_price ?? 0;
     return {
       ...optionItem,
       option_group_item_id: optionGroupItemId,
@@ -80,10 +81,12 @@ function normalizeOptionItems(optionItems) {
     };
   });
 }
-function normalizeBundleItems(bundleItems, preferPriceField = false) {
+function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundleSellingPrice = false) {
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(bundleItem => {
-    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
+    // Weighed manual prices distribute the bundle base and nested options separately.
+    // Its explicit selling amount already includes those options.
+    const unitSelling = preferPriceField && !preferBundleSellingPrice ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
     const unitStr = toPriceString(unitSelling, '0.00');
     const num = toSafePositiveInt(bundleItem?.num ?? bundleItem?.quantity, 1);
     const magnitudeSource = {
@@ -147,19 +150,25 @@ function transformBaseProductToOrderProduct(params) {
   const productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant?.production_code : origin?.production_code ?? sourceProduct?.production_code);
   const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
-  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
+  // 称重商品使用改价前净重金额；其它商品从商品/variant 快照读取目录价。
+  // 售价仍由 line_total - bundle 推导。
   const catalogSourcePrice = matchedVariant?.price ?? matchedVariant?.base_price ?? origin?.price ?? origin?.base_price ?? sourceProduct?.price ?? sourceProduct?.selling_price ?? sourceProduct?.base_price;
-  const sourceProductPrice = toPriceString(hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice, '0.00');
+  const weighedSourcePrice = (0, _weighedProduct.resolveWeighedSourcePrice)(payload.product_sku ?? origin.product_sku, payload._extend?.weighing ?? origin._extend?.weighing);
+  const sourceProductPrice = toPriceString(weighedSourcePrice ?? (hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice), '0.00');
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item));
-  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride);
+  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+    bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
+    useOriginalBundle: true
+  })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
     extendOriginTotal: payload._extend?.origin_total,
     originExtendOriginTotal: origin?._extend?.origin_total,
@@ -260,6 +269,12 @@ function transformBaseProductToOrderProduct(params) {
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),
     _origin: {
       ...(sourceProduct || {}),
+      ...(weighedSourcePrice !== undefined && hasPriceOverride ? {
+        _extend: {
+          ...sourceProduct?._extend,
+          origin_total: originTotal
+        }
+      } : {}),
       callbackData: payload
     }
   };

package/lib/solution/BaseSales/utils.js

@@ -8,6 +8,7 @@ exports.createEmptySummary = createEmptySummary;
 exports.getSafeProductNum = getSafeProductNum;
 exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
 exports.normalizeOrderProduct = normalizeOrderProduct;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
 var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
@@ -237,7 +238,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

package/lib/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 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -8,6 +8,7 @@ import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
+import type { GlobalScanSearchType } from './utils/scan/formatGlobalScan';
 import type { AddAddTimeProductToBookingInput, AddAddTimeProductsToBookingInput, GlobalScanHandleResult, GlobalScanHostBridge } from './types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
 import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
@@ -31,10 +32,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private orderCustomerDiscountRefreshCustomerId;
     private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
+    private readonly customerResolveRequests;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
     protected openDataTarget: string | null;
-    private readonly customerResolveRequests;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -537,6 +538,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * ```
      */
     handleGlobalScanCode(code: string, bridge?: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;
+    /** 查询码类型；复用原有识别和缓存，不写订单、不打开选择 UI。 */
+    getGlobalScanCodeType(code: string): Promise<GlobalScanSearchType | null>;
     resolveBestAddTimePlan(addTimeProducts: any[], targetMinutes: number): any;
     /**
      * 构造一条绑定到已有 booking 的加时商品行。

package/lib/solution/BookingTicket/index.js

@@ -162,10 +162,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   orderCustomerDiscountRefreshCustomerId = null;
   orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
+  customerResolveRequests = new Map();
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
   openDataTarget = null;
-  customerResolveRequests = new Map();
 
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -1685,8 +1685,8 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         confirmDetail: guardCallback(bridge.confirmDetail),
         confirmBookingEdit: guardCallback(bridge.confirmBookingEdit),
         applyPromotionCode: guardCallback(bridge.applyPromotionCode),
-        requestCustomerSwitch: guardCallback(bridge.requestCustomerSwitch),
         openOrder: guardCallback(bridge.openOrder),
+        requestCustomerSwitch: guardCallback(bridge.requestCustomerSwitch),
         openProductDetail: bridge.openProductDetail ? payload => {
           beforeScanDialog();
           return bridge.openProductDetail(payload);
@@ -1743,6 +1743,18 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       };
     }
   }
+
+  /** 查询码类型；复用原有识别和缓存，不写订单、不打开选择 UI。 */
+  async getGlobalScanCodeType(code) {
+    const trimmed = typeof code === 'string' ? code.trim() : '';
+    if (!trimmed) return null;
+    const scan = (0, _handleScan.handleGlobalScan)(this.request, value => this.store.products.findProductsByCodeOrBarcode(value), this.getSubmitOrderSalesChannel());
+    const raw = await scan({
+      type: 'nativeScanner',
+      value: trimmed
+    });
+    return (0, _formatGlobalScan.formatGlobalScanResult)(raw, trimmed)?.searchType ?? null;
+  }
   resolveBestAddTimePlan(addTimeProducts, targetMinutes) {
     return (0, _resolveBestAddTimePlan.resolveBestAddTimePlan)(addTimeProducts, targetMinutes);
   }

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

@@ -1,5 +1,7 @@
 import type { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
+import { type CustomerInvoiceLanguageCode, type CustomerInvoiceLanguageOption } from '../../shared/receipt/customerInvoiceLanguages';
+export type { CustomerInvoiceLanguageCode, CustomerInvoiceLanguageOption, } from '../../shared/receipt/customerInvoiceLanguages';
 import type { InvoiceLayoutConfig } from '../../modules/OpenData';
 import { type SmallTicketData } from '../../shared/receipt/small-ticket';
 export interface OrderInvoicePreviewInput {
@@ -19,6 +21,9 @@ export interface OrderInvoicePreviewResult {
     sourceRevision: string;
     generatedAt: string;
     locale: string;
+    secondaryLocale?: string;
+    languageOptions: CustomerInvoiceLanguageOption[];
+    selectedLanguage: CustomerInvoiceLanguageCode;
     orderId: string | number;
     source: Record<string, any>;
     shop: Record<string, any>;
@@ -40,6 +45,7 @@ export declare class OrderInvoicePreviewImpl extends BaseModule implements Modul
     private disposed;
     private input?;
     private activeKey;
+    private languageSelection?;
     private pending?;
     private snapshotCache;
     constructor(name?: string);
@@ -51,6 +57,10 @@ export declare class OrderInvoicePreviewImpl extends BaseModule implements Modul
     private loadContext;
     private loadSource;
     prepare(input: OrderInvoicePreviewInput): Promise<OrderInvoicePreviewResult>;
+    private getSelectionScope;
+    private documentIdentity;
+    /** Switch only the ready receipt projection; no fetching or rebuilding data. */
+    selectLanguage(code: string): OrderInvoicePreviewResult;
     retry(): Promise<OrderInvoicePreviewResult>;
     destroy(): void;
 }