@pisell/pisellos 2.3.106 → 2.3.107

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/dist/model/strategy/adapter/promotion/index.js +0 -9
  2. package/dist/modules/Discount/index.js +4 -1
  3. package/dist/modules/Discount/types.d.ts +10 -0
  4. package/dist/modules/OpenData/index.d.ts +15 -2
  5. package/dist/modules/OpenData/index.js +307 -19
  6. package/dist/modules/OpenData/types.d.ts +55 -0
  7. package/dist/modules/OpenData/types.js +7 -1
  8. package/dist/modules/OpenData/utils.d.ts +21 -1
  9. package/dist/modules/OpenData/utils.js +138 -0
  10. package/dist/modules/Order/index.d.ts +3 -1
  11. package/dist/modules/Order/index.js +69 -16
  12. package/dist/modules/Order/types.d.ts +13 -0
  13. package/dist/modules/Order/utils.d.ts +4 -1
  14. package/dist/modules/Order/utils.js +57 -3
  15. package/dist/plugins/request.d.ts +2 -1
  16. package/dist/plugins/request.js +4 -2
  17. package/dist/server/index.d.ts +14 -0
  18. package/dist/server/index.js +1732 -1285
  19. package/dist/server/modules/order/types.d.ts +50 -0
  20. package/dist/server/modules/order/types.js +2 -0
  21. package/dist/server/utils/small-ticket.d.ts +4 -1
  22. package/dist/server/utils/small-ticket.js +461 -96
  23. package/dist/solution/BaseSales/index.d.ts +5 -1
  24. package/dist/solution/BaseSales/index.js +120 -45
  25. package/dist/solution/BaseSales/utils/parseSalesResponse.d.ts +2 -0
  26. package/dist/solution/BaseSales/utils/parseSalesResponse.js +1 -1
  27. package/dist/solution/BookingByStep/index.d.ts +1 -1
  28. package/dist/solution/BookingTicket/index.d.ts +8 -3
  29. package/dist/solution/BookingTicket/index.js +558 -443
  30. package/dist/solution/Sales/index.d.ts +16 -1
  31. package/dist/solution/Sales/index.js +338 -63
  32. package/dist/solution/Sales/types.d.ts +10 -0
  33. package/dist/solution/UnifiedBookingSales/index.d.ts +5 -4
  34. package/dist/solution/UnifiedBookingSales/index.js +526 -447
  35. package/dist/solution/UnifiedBookingSales/types.d.ts +7 -1
  36. package/lib/modules/Discount/index.js +4 -1
  37. package/lib/modules/Discount/types.d.ts +10 -0
  38. package/lib/modules/OpenData/index.d.ts +15 -2
  39. package/lib/modules/OpenData/index.js +230 -3
  40. package/lib/modules/OpenData/types.d.ts +55 -0
  41. package/lib/modules/OpenData/types.js +9 -1
  42. package/lib/modules/OpenData/utils.d.ts +21 -1
  43. package/lib/modules/OpenData/utils.js +126 -0
  44. package/lib/modules/Order/index.d.ts +3 -1
  45. package/lib/modules/Order/index.js +52 -1
  46. package/lib/modules/Order/types.d.ts +13 -0
  47. package/lib/modules/Order/utils.d.ts +4 -1
  48. package/lib/modules/Order/utils.js +58 -1
  49. package/lib/plugins/request.d.ts +2 -1
  50. package/lib/plugins/request.js +3 -2
  51. package/lib/server/index.d.ts +14 -0
  52. package/lib/server/index.js +453 -105
  53. package/lib/server/modules/order/types.d.ts +50 -0
  54. package/lib/server/modules/order/types.js +1 -0
  55. package/lib/server/utils/small-ticket.d.ts +4 -1
  56. package/lib/server/utils/small-ticket.js +427 -72
  57. package/lib/solution/BaseSales/index.d.ts +5 -1
  58. package/lib/solution/BaseSales/index.js +84 -7
  59. package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts +2 -0
  60. package/lib/solution/BaseSales/utils/parseSalesResponse.js +1 -1
  61. package/lib/solution/BookingByStep/index.d.ts +1 -1
  62. package/lib/solution/BookingTicket/index.d.ts +8 -3
  63. package/lib/solution/BookingTicket/index.js +60 -15
  64. package/lib/solution/Sales/index.d.ts +16 -1
  65. package/lib/solution/Sales/index.js +168 -1
  66. package/lib/solution/Sales/types.d.ts +10 -0
  67. package/lib/solution/UnifiedBookingSales/index.d.ts +5 -4
  68. package/lib/solution/UnifiedBookingSales/index.js +44 -15
  69. package/lib/solution/UnifiedBookingSales/types.d.ts +7 -1
  70. package/package.json +1 -1
@@ -72,6 +72,13 @@ function getVoucherPaymentLifecycleKey(payment) {
72
72
  if (!isVoucherPaymentRecord(payment)) return null;
73
73
  return `${String(payment.voucher_id)}::${String(payment.status || '')}`;
74
74
  }
75
+ function hasPersistedOrderId(orderId) {
76
+ if (orderId === undefined || orderId === null || orderId === '') return false;
77
+ if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
78
+ const normalizedOrderId = Number(orderId);
79
+ if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
80
+ return String(orderId).trim() !== '';
81
+ }
75
82
  class OrderModule extends _BaseModule.BaseModule {
76
83
  defaultName = 'order';
77
84
  defaultVersion = '1.0.0';
@@ -473,6 +480,13 @@ class OrderModule extends _BaseModule.BaseModule {
473
480
  const discountList = prepareConfigResult?.discountList;
474
481
  this.store.availableWalletIds = prepareConfigResult?.availableWalletIds || [];
475
482
  this.store.virtualCurrencyList = prepareConfigResult?.virtualCurrencyList || [];
483
+ if (prepareConfigResult) {
484
+ this.writePointCardSnapshotFromPrepareConfig({
485
+ orderId,
486
+ customerId: params.customerId,
487
+ availableWalletPassList: prepareConfigResult.availableWalletPassList || []
488
+ });
489
+ }
476
490
  if (discountList) {
477
491
  const currentDiscountList = this.store.discount?.getDiscountList() || [];
478
492
  const currentEditDiscounts = currentDiscountList.filter(discount => discount?.isEditMode);
@@ -991,6 +1005,32 @@ class OrderModule extends _BaseModule.BaseModule {
991
1005
  now: (0, _utils.formatDateTime)(new Date())
992
1006
  });
993
1007
  }
1008
+ clearTempOrderPointCardSnapshot(tempOrder) {
1009
+ const orderMetaList = (0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list);
1010
+ if (!orderMetaList) return;
1011
+ const nextOrderMetaList = {
1012
+ ...orderMetaList
1013
+ };
1014
+ delete nextOrderMetaList.point_cards_snapshot;
1015
+ if (Object.keys(nextOrderMetaList).length === 0) {
1016
+ delete tempOrder.order_meta_list;
1017
+ return;
1018
+ }
1019
+ tempOrder.order_meta_list = nextOrderMetaList;
1020
+ }
1021
+ writePointCardSnapshotFromPrepareConfig(params) {
1022
+ const tempOrder = this.store.tempOrder;
1023
+ if (!tempOrder) return;
1024
+ if (String(tempOrder.customer_id ?? '') !== String(params.customerId)) return;
1025
+ const effectiveOrderId = params.orderId ?? tempOrder.order_id;
1026
+ if (hasPersistedOrderId(effectiveOrderId)) return;
1027
+ tempOrder.order_meta_list = {
1028
+ ...((0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list) || {}),
1029
+ point_cards_snapshot: (0, _utils.buildPointCardSnapshotFromWalletPassList)(params.availableWalletPassList)
1030
+ };
1031
+ this.persistTempOrder();
1032
+ this.saveDraftInBackground();
1033
+ }
994
1034
  createExternalSaleNumber() {
995
1035
  const timestamp = (0, _dayjs.default)().format('YYYYMMDDHHmmssSSS');
996
1036
  const random6 = String(Math.floor(Math.random() * 1000000)).padStart(6, '0');
@@ -2659,6 +2699,10 @@ class OrderModule extends _BaseModule.BaseModule {
2659
2699
  email: tempOrder.email
2660
2700
  });
2661
2701
  const nextCustomerId = tempOrder.customer_id ?? null;
2702
+ if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '') && !hasPersistedOrderId(tempOrder.order_id)) {
2703
+ this.store.availableWalletIds = [];
2704
+ this.clearTempOrderPointCardSnapshot(tempOrder);
2705
+ }
2662
2706
  this.persistTempOrder();
2663
2707
  return {
2664
2708
  customerId: tempOrder.customer_id,
@@ -2695,6 +2739,9 @@ class OrderModule extends _BaseModule.BaseModule {
2695
2739
  if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
2696
2740
  this.store.availableWalletIds = [];
2697
2741
  this.store.virtualCurrencyList = [];
2742
+ if (!hasPersistedOrderId(tempOrder.order_id)) {
2743
+ this.clearTempOrderPointCardSnapshot(tempOrder);
2744
+ }
2698
2745
  (0, _utils.clearTempOrderHolderAssignments)(tempOrder);
2699
2746
  this.clearCustomerBoundDiscounts(tempOrder);
2700
2747
  this.applyDiscount();
@@ -2734,6 +2781,9 @@ class OrderModule extends _BaseModule.BaseModule {
2734
2781
  if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
2735
2782
  this.store.availableWalletIds = [];
2736
2783
  this.store.virtualCurrencyList = [];
2784
+ if (!hasPersistedOrderId(tempOrder.order_id)) {
2785
+ this.clearTempOrderPointCardSnapshot(tempOrder);
2786
+ }
2737
2787
  this.clearCustomerBoundDiscounts(tempOrder);
2738
2788
  this.applyDiscount();
2739
2789
  this.persistTempOrder();
@@ -4666,7 +4716,7 @@ class OrderModule extends _BaseModule.BaseModule {
4666
4716
  params.forceRemote = false;
4667
4717
  }
4668
4718
  const res = await this.request.get(`/order/sales/${encodeURIComponent(lookup)}`, {
4669
- with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'refunds', 'notes'],
4719
+ with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'],
4670
4720
  ...(params.forceRemote ? {
4671
4721
  forceRemote: true
4672
4722
  } : {})
@@ -4965,6 +5015,7 @@ class OrderModule extends _BaseModule.BaseModule {
4965
5015
  nextTempOrder.contacts_info = raw.contacts_info && typeof raw.contacts_info === 'object' && !Array.isArray(raw.contacts_info) ? {
4966
5016
  ...raw.contacts_info
4967
5017
  } : null;
5018
+ nextTempOrder.order_meta_list = (0, _utils.normalizeOrderMetaList)(raw.order_meta_list);
4968
5019
  nextTempOrder._extend = raw._extend && typeof raw._extend === 'object' ? {
4969
5020
  ...raw._extend,
4970
5021
  productsByUid: raw._extend.productsByUid || {}
@@ -195,6 +195,17 @@ export interface OrderProductSku {
195
195
  export interface OrderLocalizedText {
196
196
  [locale: string]: string | null;
197
197
  }
198
+ export interface PointCardSnapshotItem {
199
+ id: number | string;
200
+ tag: 'point_card';
201
+ product_id?: number | string;
202
+ product_name: string;
203
+ par_value: string;
204
+ used_par_value: string;
205
+ }
206
+ export interface OrderMetaList {
207
+ point_cards_snapshot?: PointCardSnapshotItem[];
208
+ }
198
209
  export interface OrderProduct extends OrderProductIdentity {
199
210
  order_detail_id: number | null;
200
211
  num: number;
@@ -361,6 +372,7 @@ export interface OrderTempOrder {
361
372
  contacts: any[];
362
373
  contacts_info: Record<string, any> | null;
363
374
  holder: Record<string, any> | null;
375
+ order_meta_list?: OrderMetaList;
364
376
  metadata: Record<string, any>;
365
377
  summary?: OrderSummary;
366
378
  _extend?: {
@@ -566,6 +578,7 @@ export interface SubmitSalesOrderParams {
566
578
  contacts: any[];
567
579
  contacts_info: Record<string, any> | null;
568
580
  holder: Record<string, any> | null;
581
+ order_meta_list?: OrderMetaList;
569
582
  metadata: Record<string, any>;
570
583
  summary?: OrderSummary;
571
584
  small_ticket_data_flag?: number;
@@ -1,6 +1,6 @@
1
1
  import Decimal from 'decimal.js';
2
2
  import type { CartItem } from "../Cart";
3
- import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
3
+ import type { OrderProductDiscountItem, OrderMetaList, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder, PointCardSnapshotItem } from './types';
4
4
  import type { RulesParamsHooks } from '../Rules/types';
5
5
  import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
6
6
  import { createUuidV4 } from './utils/orderCollectionIdentity';
@@ -16,6 +16,9 @@ export interface OrderProductsDepositSummary {
16
16
  hasDeposit: boolean;
17
17
  }
18
18
  import type { WindowPlugin } from '../../plugins';
19
+ export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
20
+ export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
21
+ export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;
19
22
  /**
20
23
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
21
24
  *
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "buildManualProductDiscountItem", {
9
9
  return _manualProductDiscount.buildManualProductDiscountItem;
10
10
  }
11
11
  });
12
+ exports.buildPointCardSnapshotFromWalletPassList = buildPointCardSnapshotFromWalletPassList;
12
13
  exports.buildSubmitPayload = buildSubmitPayload;
13
14
  exports.calculateOrderProductsDeposit = calculateOrderProductsDeposit;
14
15
  exports.clearTempOrderHolderAssignments = clearTempOrderHolderAssignments;
@@ -67,7 +68,9 @@ exports.mergeOrderProductDisplayFields = mergeOrderProductDisplayFields;
67
68
  exports.mergeRelationForms = void 0;
68
69
  exports.normalizeBookingIsAll = normalizeBookingIsAll;
69
70
  exports.normalizeBookingSubType = normalizeBookingSubType;
71
+ exports.normalizeOrderMetaList = normalizeOrderMetaList;
70
72
  exports.normalizeOrderProductDiscountList = normalizeOrderProductDiscountList;
73
+ exports.normalizePointCardSnapshotItem = normalizePointCardSnapshotItem;
71
74
  exports.normalizeProductSkuOptions = normalizeProductSkuOptions;
72
75
  exports.normalizeSubmitBooking = normalizeSubmitBooking;
73
76
  exports.normalizeSubmitCollectPaxValue = normalizeSubmitCollectPaxValue;
@@ -129,6 +132,55 @@ var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
129
132
  var _salesNotes = require("./salesNotes");
130
133
  var _manualProductDiscount = require("./utils/manualProductDiscount");
131
134
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
135
+ const POINT_CARD_SNAPSHOT_TAG = 'point_card';
136
+ function isPlainObject(value) {
137
+ return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
138
+ }
139
+ function normalizeSnapshotScalar(value) {
140
+ if (value === undefined || value === null) return undefined;
141
+ if (typeof value === 'string') return value.trim() ? value : undefined;
142
+ if (typeof value === 'number') return Number.isFinite(value) ? value : undefined;
143
+ return undefined;
144
+ }
145
+ function normalizePointCardSnapshotItem(value) {
146
+ if (!isPlainObject(value)) return null;
147
+ const id = normalizeSnapshotScalar(value.id);
148
+ if (id === undefined) return null;
149
+ if (String(value.tag || '').trim().toLowerCase() !== POINT_CARD_SNAPSHOT_TAG) {
150
+ return null;
151
+ }
152
+ const snapshot = {
153
+ id,
154
+ tag: 'point_card',
155
+ product_name: String(value.product_name ?? ''),
156
+ par_value: String(value.par_value ?? ''),
157
+ used_par_value: String(value.used_par_value ?? '')
158
+ };
159
+ const productId = normalizeSnapshotScalar(value.product_id);
160
+ if (productId !== undefined) {
161
+ snapshot.product_id = productId;
162
+ }
163
+ return snapshot;
164
+ }
165
+ function buildPointCardSnapshotFromWalletPassList(value) {
166
+ if (!Array.isArray(value)) return [];
167
+ return value.reduce((result, item) => {
168
+ const normalized = normalizePointCardSnapshotItem(item);
169
+ if (normalized) result.push(normalized);
170
+ return result;
171
+ }, []);
172
+ }
173
+ function normalizeOrderMetaList(value) {
174
+ if (value === undefined) return undefined;
175
+ if (!isPlainObject(value)) return undefined;
176
+ const normalized = {};
177
+ if (Object.prototype.hasOwnProperty.call(value, 'point_cards_snapshot')) {
178
+ normalized.point_cards_snapshot = buildPointCardSnapshotFromWalletPassList(value.point_cards_snapshot);
179
+ }
180
+ if (Object.keys(normalized).length > 0) return normalized;
181
+ return {};
182
+ }
183
+
132
184
  /**
133
185
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
134
186
  *
@@ -1248,6 +1300,7 @@ function buildSubmitPayload(params) {
1248
1300
  start_time: _startTime,
1249
1301
  customer: _customer,
1250
1302
  discount_list: _discountList,
1303
+ order_meta_list: _orderMetaList,
1251
1304
  tax_fee: _rootTaxFee,
1252
1305
  total_amount: _totalAmount,
1253
1306
  total_refund_amount: _totalRefundAmount,
@@ -1258,6 +1311,7 @@ function buildSubmitPayload(params) {
1258
1311
  ...tempOrderRest
1259
1312
  } = tempOrder;
1260
1313
  const resolvedBusinessCode = businessCode ?? tempOrder.business_code;
1314
+ const normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
1261
1315
  const submitType = resolveSubmitOrderType({
1262
1316
  requestedType: type,
1263
1317
  tempOrderType: tempOrder.type,
@@ -1324,7 +1378,10 @@ function buildSubmitPayload(params) {
1324
1378
  } : {}),
1325
1379
  products: (tempOrder.products || []).map(product => normalizeSubmitProduct(product, {
1326
1380
  virtualSettlementMode
1327
- }))
1381
+ })),
1382
+ ...(normalizedOrderMetaList !== undefined ? {
1383
+ order_meta_list: normalizedOrderMetaList
1384
+ } : {})
1328
1385
  };
1329
1386
  if (!enhance) return payload;
1330
1387
  const enhancedPayload = enhance(payload, {
@@ -70,6 +70,7 @@ export interface RequestOptions {
70
70
  cache?: CacheProps;
71
71
  cacheUpdateChange?: (data: any) => void;
72
72
  osServer?: boolean;
73
+ isNocobase?: boolean;
73
74
  prefix?: boolean;
74
75
  callback?: (res: any) => void;
75
76
  subscriberId?: string;
@@ -125,7 +126,7 @@ declare class RequestPluginImpl implements RequestPlugin {
125
126
  /**
126
127
  * GET 请求
127
128
  */
128
- get<T = any>(url: string, options?: RequestOptions): Promise<T>;
129
+ get<T = any>(url: string, dataOrOptions?: any, options?: RequestOptions): Promise<T>;
129
130
  /**
130
131
  * POST 请求
131
132
  */
@@ -99,9 +99,10 @@ class RequestPluginImpl {
99
99
  /**
100
100
  * GET 请求
101
101
  */
102
- get(url, options = {}) {
102
+ get(url, dataOrOptions = {}, options) {
103
+ const requestOptions = options ?? dataOrOptions;
103
104
  return this.request({
104
- ...options,
105
+ ...requestOptions,
105
106
  url,
106
107
  method: 'GET'
107
108
  });
@@ -515,6 +515,10 @@ declare class Server {
515
515
  private buildCheckoutTaskIdempotencyKey;
516
516
  private isBlankCheckoutValue;
517
517
  private isLocalCheckoutOrderId;
518
+ private normalizePrintInvoiceLayoutConfig;
519
+ private extractInvoiceLayoutConfig;
520
+ private normalizePrintInvoiceTemplateSettings;
521
+ private extractInvoiceTemplateSettings;
518
522
  private applyCheckoutFulfillmentBuzzer;
519
523
  private buildCheckoutResourceIdentifierBuzzer;
520
524
  private getCheckoutResourceIdentifier;
@@ -534,7 +538,10 @@ declare class Server {
534
538
  private dispatchLocalReceiptPrint;
535
539
  private shouldLookupLocalPrintOrder;
536
540
  private getLocalPrintOrderLookup;
541
+ private mergeLocalPrintOrderInput;
537
542
  private handleLocalPrintOrder;
543
+ private normalizeRequestedReceiptLocales;
544
+ private handleLocalOrderReceiptSnapshot;
538
545
  private handleMachinecodeBatchMeta;
539
546
  private resolveMachinecodeBatchMetadataLookup;
540
547
  private syncMachinecodeRedeemStatusToLocalOrder;
@@ -543,6 +550,11 @@ declare class Server {
543
550
  private handleOrderDraftSubmit;
544
551
  private handlePendingSyncCheckoutOrder;
545
552
  private buildPendingSyncCheckoutOrder;
553
+ /**
554
+ * Checkout 与本地小票必须消费同一份规范化子项快照。
555
+ * 商品/预约只折叠持久化 ID 或协议 UID 相同的行;支付额外兼容 payment_number。
556
+ */
557
+ private normalizeCheckoutCollections;
546
558
  /**
547
559
  * Android 结账自动小票由当前设备设置控制;其它平台保持原有行为。
548
560
  */
@@ -572,6 +584,8 @@ declare class Server {
572
584
  private shouldLookupPaymentMethodNameByCode;
573
585
  private enrichPaymentNamesByCode;
574
586
  private withLocalSmallTicketData;
587
+ private normalizeRemoteSalesOrderErrorCode;
588
+ private fetchAndPersistSalesOrderByLookup;
575
589
  private handleOrderSalesDetail;
576
590
  /**
577
591
  * 解析 order_ids 入参,兼容 url query / data 字段、字符串(csv) / 数组两种形态。