@pisell/pisellos 0.10.43 → 0.10.44

package/lib/server/index.d.ts

@@ -421,6 +421,7 @@ declare class Server {
     private shouldUseLocalOrderQuery;
     /**
      * 预约查询是否走本地：
+     * - 日历周/月/资源视图通过 compact_fields 显式标识，始终走远端；
      * - 当 sales_time_between 的开始和结束都不是今天时，走远端；
      * - 其余情况走本地。
      */
@@ -524,6 +525,12 @@ declare class Server {
     private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
+    /**
+     * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+     * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+     * 都使用同一份完整快照。
+     */
+    private finalizeCheckoutSalesNotes;
     private dispatchCheckoutSyncTask;
     private dispatchPrintOtherReceiptTask;
     private buildPrintOtherReceiptIdempotencyKey;

package/lib/server/index.js

@@ -27,6 +27,7 @@ var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
+var _salesNotes = require("../modules/Order/salesNotes");
 var _orderCollectionIdentity = require("../modules/Order/utils/orderCollectionIdentity");
 var _osPrivatePayload = require("../utils/os-private-payload");
 var _OpenData = require("../modules/OpenData");
@@ -2172,10 +2173,12 @@ class Server {
 
   /**
    * 预约查询是否走本地：
+   * - 日历周/月/资源视图通过 compact_fields 显式标识，始终走远端；
    * - 当 sales_time_between 的开始和结束都不是今天时，走远端；
    * - 其余情况走本地。
    */
   shouldUseLocalBookingQuery(data) {
+    if (data?.compact_fields === true) return false;
     const range = data?.sales_time_between;
     if (!Array.isArray(range) || range.length < 2) return true;
     return !this.isRangeBothNotToday(range[0], range[1]);
@@ -3682,14 +3685,16 @@ class Server {
     };
     const needsShopOrderNumber = next.shop_order_number === undefined || next.shop_order_number === null || next.shop_order_number === '';
     const needsShopFullOrderNumber = next.shop_full_order_number === undefined || next.shop_full_order_number === null || next.shop_full_order_number === '';
-    if (!needsShopOrderNumber && !needsShopFullOrderNumber) return next;
+    if (!needsShopOrderNumber && !needsShopFullOrderNumber) {
+      return this.finalizeCheckoutSalesNotes(next, title);
+    }
     const idGenerator = this.getIdGeneratorPlugin();
     if (!idGenerator) {
       this.logWarning(`${title}: idGenerator 插件不可用，无法生成订单号`, {
         needsShopOrderNumber,
         needsShopFullOrderNumber
       });
-      return next;
+      return this.finalizeCheckoutSalesNotes(next, title);
     }
     try {
       if (needsShopOrderNumber && idGenerator.generateShopOrderNumber) {
@@ -3711,7 +3716,38 @@ class Server {
         error: error instanceof Error ? error.message : String(error)
       });
     }
-    return next;
+    return this.finalizeCheckoutSalesNotes(next, title);
+  }
+
+  /**
+   * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+   * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+   * 都使用同一份完整快照。
+   */
+  finalizeCheckoutSalesNotes(data, title) {
+    if (!data || typeof data !== 'object') return data;
+    if (!Object.prototype.hasOwnProperty.call(data, 'notes')) return data;
+    if (data.notes === undefined || data.notes === null) return data;
+    if (!Array.isArray(data.notes)) {
+      throw new Error('[Order Notes] checkout notes 必须为数组');
+    }
+    if (data.notes.length === 0) return data;
+    const productTargetUuids = (Array.isArray(data.products) ? data.products : []).map(product => product?.metadata?.unique_identification_number ?? product?.unique_identification_number).filter(targetUuid => targetUuid !== undefined && targetUuid !== null && String(targetUuid).trim().length > 0).map(targetUuid => String(targetUuid));
+    const shopOrderNumber = String(data.shop_order_number ?? '').trim();
+    const notes = (0, _salesNotes.finalizeSalesNotesForCheckout)({
+      notes: data.notes,
+      shopOrderNumber,
+      productTargetUuids
+    });
+    this.logInfo(`${title}: checkout Notes 已绑定订单号`, {
+      shop_order_number: shopOrderNumber,
+      note_count: notes.length
+    });
+    return {
+      ...data,
+      shop_order_number: shopOrderNumber,
+      notes
+    };
   }
   async dispatchCheckoutSyncTask(params) {
     this.registerDeviceTaskActions();

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

@@ -2017,6 +2017,12 @@ class OrderModule extends _BaseModule.BaseModule {
       mergedRecord[field] = (0, _lodashEs.cloneDeep)(incomingRecord[field]);
     }
 
+    // order_meta_list 是一次性生成的完整业务快照。incoming 明确携带时
+    // 必须整体覆盖（包括 null / 空对象 / 空数组）；省略时才保留 existing。
+    if (Object.prototype.hasOwnProperty.call(incomingRecord, 'order_meta_list')) {
+      mergedRecord.order_meta_list = (0, _lodashEs.cloneDeep)(incomingRecord.order_meta_list);
+    }
+
     // 子项数组遵循完整快照语义：incoming 自有且为数组（包括 []）时权威替换；
     // 字段缺席或不是数组时视为稀疏 patch，继续保留 existing。
     for (const field of ORDER_AUTHORITATIVE_COLLECTION_FIELDS) {

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

@@ -456,6 +456,15 @@ export interface OrderData {
             par_value: string;
             used_par_value: string;
         }>;
+        virtual_currency_snapshot?: Array<{
+            id: number | string;
+            tag: 'virtual_currency';
+            product_id?: number | string;
+            product_name: string;
+            par_value: string;
+            used_par_value: string;
+            name: Record<string, string>;
+        }>;
     };
     /**
      * 金额汇总（仅输出）。

package/lib/server/utils/small-ticket.d.ts

@@ -45,6 +45,7 @@ export interface SmallTicketProduct {
     product_uid?: string | number;
     booking_uid?: string | number;
     product_note?: string;
+    allergy?: string;
     options?: Array<{
         name: string;
         num?: number;

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

@@ -311,6 +311,7 @@ function buildBaseData(params) {
 }
 function buildProducts(order, locale, productMap) {
   const products = Array.isArray(order.products) ? order.products : [];
+  const allergyByProductUid = buildProductAllergyMap(order, locale);
   return products.map(rawProduct => {
     const product = restoreReceiptDiscountHierarchy(rawProduct);
     const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
@@ -351,6 +352,7 @@ function buildProducts(order, locale, productMap) {
       originalPrice
     });
     const productNote = resolveProductNote(product, locale);
+    const allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     const basePrice = resolveProductBasePrice(product);
     const resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
     const shouldIncludeBasePrice = options.length > 0 || resolvedCombinations.length > 0 || hasProductDiscount(product, extensionList);
@@ -380,6 +382,9 @@ function buildProducts(order, locale, productMap) {
       ...(productNote ? {
         product_note: productNote
       } : {}),
+      ...(allergy ? {
+        allergy
+      } : {}),
       ...(options.length ? {
         options
       } : {}),
@@ -782,6 +787,21 @@ function resolveProductNote(product, locale) {
   if (productNote) return productNote;
   return getLocalizedValue(product.note, locale).trim();
 }
+function buildProductAllergyMap(order, locale) {
+  const allergyByProductUid = new Map();
+  for (const note of normalizeArray(order.notes)) {
+    if (!note || typeof note !== 'object' || Array.isArray(note) || String(note.note_type || '').trim() !== 'allergy') {
+      continue;
+    }
+    const content = getLocalizedValue(note.content?.text, locale).trim();
+    if (!content) continue;
+    const relation = normalizeArray(note.note_relations).find(item => item && typeof item === 'object' && !Array.isArray(item) && item.relation_type === 'about' && item.target_type === 'order_detail' && Number(item.is_primary) === 1);
+    const productUid = String(relation?.target_uuid ?? '').trim();
+    if (!productUid || allergyByProductUid.has(productUid)) continue;
+    allergyByProductUid.set(productUid, content);
+  }
+  return allergyByProductUid;
+}
 function resolveBundleProductTitle(params) {
   const {
     bundle,
@@ -1358,20 +1378,30 @@ function resolveRefundPayment(refund, payments) {
   return matchedPayment || refund;
 }
 function buildWallets(params) {
+  const virtualCurrencySnapshots = collectVirtualCurrencySnapshots(params.order);
   const displayedWalletPayments = normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment));
-  const paymentWallets = displayedWalletPayments.map(payment => buildPaymentItems({
-    payment,
-    locale: params.locale,
-    currencySymbol: params.currencySymbol,
-    includeFundRecordBalance: true,
-    includeFundRecordUsage: false,
-    includePaymentAmount: false
-  }));
+  const paymentWallets = displayedWalletPayments.map(payment => {
+    const virtualCurrencySnapshot = findVirtualCurrencySnapshotForPayment(payment, virtualCurrencySnapshots.byId);
+    return buildPaymentItems({
+      payment,
+      locale: params.locale,
+      currencySymbol: params.currencySymbol,
+      includeFundRecordBalance: true,
+      includeFundRecordUsage: false,
+      includePaymentAmount: false,
+      virtualCurrencyUnit: virtualCurrencySnapshot ? getVirtualCurrencySnapshotUnit(virtualCurrencySnapshot, params.locale) : undefined
+    });
+  });
   const displayedWalletPassIds = collectDisplayedWalletPassIds(displayedWalletPayments);
   return [...paymentWallets, ...buildVoucherAssets(params), ...buildPointCardSnapshotAssets({
     order: params.order,
     locale: params.locale,
     displayedWalletPassIds
+  }), ...buildVirtualCurrencySnapshotAssets({
+    snapshots: virtualCurrencySnapshots.items,
+    order: params.order,
+    locale: params.locale,
+    displayedWalletPassIds
   })];
 }
 function collectDisplayedWalletPassIds(payments) {
@@ -1418,6 +1448,88 @@ function buildPointCardSnapshotAssets(params) {
     return [rows];
   });
 }
+function collectVirtualCurrencySnapshots(order) {
+  const items = [];
+  const byId = new Map();
+  const snapshots = order.order_meta_list?.virtual_currency_snapshot;
+  if (!Array.isArray(snapshots)) return {
+    items,
+    byId
+  };
+  snapshots.forEach(snapshot => {
+    if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) return;
+    const virtualCurrency = snapshot;
+    if (stringify(virtualCurrency.tag).trim().toLowerCase() !== 'virtual_currency') return;
+    const id = normalizeWalletPassId(virtualCurrency.id);
+    if (!id || byId.has(id)) return;
+    byId.set(id, virtualCurrency);
+    items.push(virtualCurrency);
+  });
+  return {
+    items,
+    byId
+  };
+}
+function findVirtualCurrencySnapshotForPayment(payment, snapshotsById) {
+  const fundRecord = getFundRecord(payment);
+  for (const value of [fundRecord?.voucher_id, payment.voucher_id]) {
+    const id = normalizeWalletPassId(value);
+    if (!id) continue;
+    const snapshot = snapshotsById.get(id);
+    if (snapshot) return snapshot;
+  }
+  return undefined;
+}
+function buildVirtualCurrencySnapshotAssets(params) {
+  const snapshotTime = firstPresentValue(params.order.updated_at, params.order.created_at);
+  return params.snapshots.flatMap(virtualCurrency => {
+    const id = normalizeWalletPassId(virtualCurrency.id);
+    if (!id || params.displayedWalletPassIds.has(id)) return [];
+    const rows = [{
+      item: stringify(virtualCurrency.product_name).trim(),
+      value: ''
+    }];
+    const balance = getVirtualCurrencySnapshotBalance(virtualCurrency);
+    if (balance) {
+      rows.push({
+        item: label(params.locale, 'balance'),
+        value: formatVirtualCurrencyBalance(balance, getVirtualCurrencySnapshotUnit(virtualCurrency, params.locale))
+      });
+    }
+    if (isPresentId(snapshotTime)) {
+      rows.push({
+        item: formatDateTime(snapshotTime, params.locale),
+        value: ''
+      });
+    }
+    return [rows];
+  });
+}
+function getVirtualCurrencySnapshotBalance(snapshot) {
+  if (!isNumericAmount(snapshot.par_value) || !isNumericAmount(snapshot.used_par_value)) {
+    return null;
+  }
+  return _decimal.default.max(new _decimal.default(snapshot.par_value).minus(new _decimal.default(snapshot.used_par_value)), 0);
+}
+function getVirtualCurrencySnapshotUnit(snapshot, locale) {
+  return getNonEmptyLocalizedValue(snapshot.name, locale);
+}
+function getNonEmptyLocalizedValue(value, locale) {
+  if (value === undefined || value === null) return '';
+  if (typeof value !== 'object' || Array.isArray(value)) return stringify(value).trim();
+  const dashedLocale = locale.replace('_', '-');
+  const underscoredLocale = locale.replace('-', '_');
+  for (const candidate of [value[locale], value[dashedLocale], value[underscoredLocale], value.original, value.auto, value.default, value.en]) {
+    const text = stringify(candidate).trim();
+    if (text) return text;
+  }
+  return '';
+}
+function formatVirtualCurrencyBalance(value, unit) {
+  const amount = trimDecimal(value);
+  const normalizedUnit = unit.trim();
+  return normalizedUnit ? `${amount} ${normalizedUnit}` : amount;
+}
 function normalizeWalletPassId(value) {
   if (typeof value === 'number') return Number.isFinite(value) ? String(value) : null;
   if (typeof value !== 'string') return null;
@@ -1470,8 +1582,9 @@ function buildVoucherAssets(params) {
     }, ...(timeRow ? [timeRow] : [])]];
   });
 }
+const TICKET_VOUCHER_TAGS = new Set(['ticket', 'product_package_ticket', 'appointment_ticket', 'session_ticket']);
 function isTicketVoucher(voucher) {
-  return stringify(voucher.tag).trim().toLowerCase() === 'ticket';
+  return TICKET_VOUCHER_TAGS.has(stringify(voucher.tag).trim().toLowerCase());
 }
 function getVoucherValidity(voucher, locale) {
   const availableTime = firstPresentValue(voucher.available_time, voucher.avaliable_time, voucher.metadata?.available_time, voucher.metadata?.avaliable_time);
@@ -1583,7 +1696,8 @@ function buildPaymentItems(params) {
     currencySymbol,
     includeFundRecordBalance,
     includeFundRecordUsage,
-    includePaymentAmount
+    includePaymentAmount,
+    virtualCurrencyUnit
   } = params;
   const serviceFee = getPaymentServiceFee(payment);
   const items = [{
@@ -1609,7 +1723,8 @@ function buildPaymentItems(params) {
       locale,
       currencySymbol,
       includeBalance: includeFundRecordBalance,
-      includeUsage: includeFundRecordUsage
+      includeUsage: includeFundRecordUsage,
+      virtualCurrencyUnit
     }));
   } else {
     const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
@@ -1674,7 +1789,8 @@ function buildFundRecordPaymentItems(params) {
     locale,
     currencySymbol,
     includeBalance,
-    includeUsage
+    includeUsage,
+    virtualCurrencyUnit
   } = params;
   const items = [];
   const usingBeforeValue = fundRecord.using_before_value;
@@ -1696,6 +1812,14 @@ function buildFundRecordPaymentItems(params) {
     return items;
   }
   if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
+    if (virtualCurrencyUnit !== undefined) {
+      if (!isNumericAmount(usingAfterValue)) return items;
+      items.push({
+        item: label(locale, 'balance'),
+        value: formatVirtualCurrencyBalance(new _decimal.default(usingAfterValue), virtualCurrencyUnit)
+      });
+      return items;
+    }
     items.push({
       item: label(locale, 'balance'),
       value: formatMoney(usingAfterValue, currencySymbol)

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

@@ -2,7 +2,7 @@ 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, 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 { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -232,6 +232,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
+    getSalesNotes(): SalesNote[];
+    createSalesNotesMutationSnapshot(): SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot(snapshot: SalesNotesMutationSnapshot): void;
+    setSalesNote(input: SetSalesNoteInput): Promise<SalesNote>;
+    removeSalesNote(uuid: string): Promise<void>;
+    clearSalesNotes(): Promise<void>;
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
@@ -240,6 +246,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     setPickupRef(buzzer: string): string;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
+    setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
+    setServiceType(serviceType: ShopServiceType): ShopServiceData;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
@@ -263,6 +271,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private mergeHistoricalDiscountList;
     private shouldSkipAutoApplyFetchedDiscountsInEditMode;
     private mergeCurrentDiscountSelectionState;
+    private resolveDiscountConfigCustomerId;
+    /**
+     * Stable across notifyTempOrderChanged's immutable object replacement, while
+     * still distinguishing two local orders for the same customer.
+     */
+    private getDiscountConfigOrderIdentityKey;
     loadDiscountConfig(params?: {
         customerId?: number;
         action?: 'create' | 'edit';