@pisell/pisellos 2.2.326 → 2.2.327
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.
- package/dist/modules/OpenData/index.d.ts +8 -1
- package/dist/modules/OpenData/index.js +276 -95
- package/dist/server/index.d.ts +3 -0
- package/dist/server/index.js +857 -598
- package/dist/server/modules/order/index.d.ts +1 -0
- package/dist/server/modules/order/index.js +51 -51
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/Sales/index.d.ts +2 -5
- package/dist/solution/Sales/index.js +117 -143
- package/dist/solution/Sales/types.d.ts +6 -0
- package/dist/solution/Sales/types.js +2 -0
- package/lib/modules/OpenData/index.d.ts +8 -1
- package/lib/modules/OpenData/index.js +123 -21
- package/lib/server/index.d.ts +3 -0
- package/lib/server/index.js +155 -18
- package/lib/server/modules/order/index.d.ts +1 -0
- package/lib/server/modules/order/index.js +4 -3
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/Sales/index.d.ts +2 -5
- package/lib/solution/Sales/index.js +32 -66
- package/lib/solution/Sales/types.d.ts +6 -0
- package/lib/solution/Sales/types.js +1 -0
- package/package.json +1 -1
package/lib/server/index.d.ts
CHANGED
|
@@ -546,8 +546,11 @@ declare class Server {
|
|
|
546
546
|
private shouldLookupLocalPrintOrder;
|
|
547
547
|
private getLocalPrintOrderLookup;
|
|
548
548
|
private mergeLocalPrintOrderInput;
|
|
549
|
+
private loadCloudInvoiceOrder;
|
|
550
|
+
private handleCloudOrderInvoice;
|
|
549
551
|
private handleLocalPrintOrder;
|
|
550
552
|
private normalizeRequestedReceiptLocales;
|
|
553
|
+
private rebuildOrderReceipt;
|
|
551
554
|
private handleLocalOrderReceiptSnapshot;
|
|
552
555
|
private handleMachinecodeBatchMeta;
|
|
553
556
|
private resolveMachinecodeBatchMetadataLookup;
|
package/lib/server/index.js
CHANGED
|
@@ -1387,6 +1387,18 @@ class Server {
|
|
|
1387
1387
|
method: 'post',
|
|
1388
1388
|
path: '/shop/local/print-order',
|
|
1389
1389
|
handler: this.handleLocalPrintOrder.bind(this)
|
|
1390
|
+
}, {
|
|
1391
|
+
method: 'post',
|
|
1392
|
+
path: '/shop/local/cloud-order-invoice/lookup',
|
|
1393
|
+
handler: ({
|
|
1394
|
+
data
|
|
1395
|
+
}) => this.handleCloudOrderInvoice(data, false)
|
|
1396
|
+
}, {
|
|
1397
|
+
method: 'post',
|
|
1398
|
+
path: '/shop/local/cloud-order-invoice/submit',
|
|
1399
|
+
handler: ({
|
|
1400
|
+
data
|
|
1401
|
+
}) => this.handleCloudOrderInvoice(data, true)
|
|
1390
1402
|
}, {
|
|
1391
1403
|
method: 'post',
|
|
1392
1404
|
path: '/shop/local/order-receipt-snapshot',
|
|
@@ -4100,6 +4112,125 @@ class Server {
|
|
|
4100
4112
|
external_sale_number: localOrder.external_sale_number ?? definedInput.external_sale_number ?? definedInput.externalSaleNumber
|
|
4101
4113
|
};
|
|
4102
4114
|
}
|
|
4115
|
+
async loadCloudInvoiceOrder(orderId, shopId, assertCurrentShop) {
|
|
4116
|
+
if (!this.order) throw new Error('Cloud invoice order service is unavailable');
|
|
4117
|
+
const hasReceiptDetail = order => {
|
|
4118
|
+
// Use the same amount fields as the receipt builder, including historical
|
|
4119
|
+
// top-level amounts. Zero is a valid total; a missing total in a list row is not.
|
|
4120
|
+
const total = [order.summary?.expect_amount, order.expect_amount, order.summary?.total_amount, order.total_amount].find(value => value != null && value !== '');
|
|
4121
|
+
return typeof order.business_code === 'string' && !!order.business_code.trim() && (typeof total === 'number' || typeof total === 'string' && !!total.trim()) && Number.isFinite(Number(total)) && (Array.isArray(order.products) || Array.isArray(order.bookings));
|
|
4122
|
+
};
|
|
4123
|
+
const local = await this.order.getLocalOrderByLookup(orderId, {
|
|
4124
|
+
exactOrderId: true
|
|
4125
|
+
});
|
|
4126
|
+
assertCurrentShop();
|
|
4127
|
+
if (local && String(local.order_id) === orderId) {
|
|
4128
|
+
if (local.shop_id != null && String(local.shop_id) !== shopId) {
|
|
4129
|
+
throw new Error('Cloud invoice order belongs to another shop');
|
|
4130
|
+
}
|
|
4131
|
+
if (String(local.shop_id) === shopId && hasReceiptDetail(local)) return local;
|
|
4132
|
+
}
|
|
4133
|
+
|
|
4134
|
+
// The generic detail route also matches short receipt numbers. Validate the
|
|
4135
|
+
// backend identity and live shop BEFORE its result enters the shared store.
|
|
4136
|
+
const result = await this.fetchAndPersistSalesOrderByLookup(orderId, {
|
|
4137
|
+
with: ['all']
|
|
4138
|
+
}, 'cloudOrderInvoice', undefined, fresh => {
|
|
4139
|
+
assertCurrentShop();
|
|
4140
|
+
if (String(fresh.order_id) !== orderId || fresh.shop_id != null && String(fresh.shop_id) !== shopId || !hasReceiptDetail(fresh)) {
|
|
4141
|
+
throw new Error('Cloud invoice order identity or detail is invalid');
|
|
4142
|
+
}
|
|
4143
|
+
// Some older shop-authenticated detail responses omit shop_id.
|
|
4144
|
+
return fresh.shop_id == null ? {
|
|
4145
|
+
...fresh,
|
|
4146
|
+
shop_id: Number(shopId)
|
|
4147
|
+
} : fresh;
|
|
4148
|
+
});
|
|
4149
|
+
assertCurrentShop();
|
|
4150
|
+
const saved = result.order;
|
|
4151
|
+
if (!saved || String(saved.order_id) !== orderId || String(saved.shop_id) !== shopId || !hasReceiptDetail(saved)) {
|
|
4152
|
+
throw new Error(result.message || 'Cloud invoice order detail is unavailable');
|
|
4153
|
+
}
|
|
4154
|
+
return saved;
|
|
4155
|
+
}
|
|
4156
|
+
async handleCloudOrderInvoice(input, submit) {
|
|
4157
|
+
const orderId = typeof input?.order_id === 'string' ? input.order_id.trim() : Number.isSafeInteger(input?.order_id) ? String(input.order_id) : '';
|
|
4158
|
+
if (!/^[1-9]\d*$/.test(orderId)) {
|
|
4159
|
+
return {
|
|
4160
|
+
code: 400,
|
|
4161
|
+
status: false,
|
|
4162
|
+
message: 'Invalid cloud invoice order ID',
|
|
4163
|
+
data: null
|
|
4164
|
+
};
|
|
4165
|
+
}
|
|
4166
|
+
try {
|
|
4167
|
+
const shopId = String(this.getAppData('shop_id') ?? '');
|
|
4168
|
+
const tenantId = String(this.getAppData('tenant_id') ?? '');
|
|
4169
|
+
if (!/^[1-9]\d*$/.test(shopId) || !Number.isSafeInteger(Number(shopId))) {
|
|
4170
|
+
throw new Error('Cloud invoice shop is unavailable');
|
|
4171
|
+
}
|
|
4172
|
+
const assertCurrentShop = () => {
|
|
4173
|
+
if (String(this.getAppData('shop_id') ?? '') !== shopId || String(this.getAppData('tenant_id') ?? '') !== tenantId) {
|
|
4174
|
+
throw new Error('Cloud invoice shop context changed');
|
|
4175
|
+
}
|
|
4176
|
+
};
|
|
4177
|
+
const order = await this.loadCloudInvoiceOrder(orderId, shopId, assertCurrentShop);
|
|
4178
|
+
const businessCode = order.business_code.trim();
|
|
4179
|
+
if (!submit) return {
|
|
4180
|
+
code: 200,
|
|
4181
|
+
status: true,
|
|
4182
|
+
message: '',
|
|
4183
|
+
data: {
|
|
4184
|
+
business_code: businessCode
|
|
4185
|
+
}
|
|
4186
|
+
};
|
|
4187
|
+
if (input.business_code !== businessCode || typeof input.template_settings?.template !== 'string' || !input.template_settings.template.trim() || !Array.isArray(input.template_settings.modules)) {
|
|
4188
|
+
throw new Error('Cloud invoice template is missing or belongs to another business');
|
|
4189
|
+
}
|
|
4190
|
+
const settings = this.normalizePrintInvoiceTemplateSettings(input.template_settings);
|
|
4191
|
+
const receipt = await this.rebuildOrderReceipt(order, settings);
|
|
4192
|
+
const smallTicketData = receipt.payment_info?.small_ticket_data;
|
|
4193
|
+
if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) throw new Error('Cloud invoice snapshot is unavailable');
|
|
4194
|
+
const deviceTask = this.getDeviceTaskPlugin();
|
|
4195
|
+
if (!deviceTask?.dispatch) throw new Error('Print task service is unavailable');
|
|
4196
|
+
const deviceId = await this.getShortNumberOrDeviceId();
|
|
4197
|
+
assertCurrentShop();
|
|
4198
|
+
await deviceTask.dispatch({
|
|
4199
|
+
action: 'print_all',
|
|
4200
|
+
device_id: deviceId,
|
|
4201
|
+
name: 'PRINT_V1',
|
|
4202
|
+
source: 'server',
|
|
4203
|
+
source_type: 'order',
|
|
4204
|
+
source_id: order.order_id,
|
|
4205
|
+
payload: {
|
|
4206
|
+
type: '0',
|
|
4207
|
+
template_settings: settings,
|
|
4208
|
+
data: {
|
|
4209
|
+
order_id: order.order_id,
|
|
4210
|
+
small_ticket_data: smallTicketData
|
|
4211
|
+
}
|
|
4212
|
+
}
|
|
4213
|
+
});
|
|
4214
|
+
return {
|
|
4215
|
+
code: 200,
|
|
4216
|
+
status: true,
|
|
4217
|
+
message: '',
|
|
4218
|
+
data: null
|
|
4219
|
+
};
|
|
4220
|
+
} catch (error) {
|
|
4221
|
+
const message = this.getUnknownErrorMessage(error);
|
|
4222
|
+
this.logWarning('Cloud invoice request failed', {
|
|
4223
|
+
orderId,
|
|
4224
|
+
message
|
|
4225
|
+
});
|
|
4226
|
+
return {
|
|
4227
|
+
code: 500,
|
|
4228
|
+
status: false,
|
|
4229
|
+
message,
|
|
4230
|
+
data: null
|
|
4231
|
+
};
|
|
4232
|
+
}
|
|
4233
|
+
}
|
|
4103
4234
|
handleLocalPrintOrder = async ({
|
|
4104
4235
|
data
|
|
4105
4236
|
}) => {
|
|
@@ -4232,6 +4363,23 @@ class Server {
|
|
|
4232
4363
|
if (!Array.isArray(value)) return [];
|
|
4233
4364
|
return Array.from(new Set(value.filter(locale => typeof locale === 'string').map(locale => locale.trim()).filter(Boolean)));
|
|
4234
4365
|
}
|
|
4366
|
+
rebuildOrderReceipt(order, templateSettings, locales) {
|
|
4367
|
+
const paymentInfo = {
|
|
4368
|
+
...order.payment_info
|
|
4369
|
+
};
|
|
4370
|
+
delete paymentInfo.small_ticket_data;
|
|
4371
|
+
return this.withLocalSmallTicketData({
|
|
4372
|
+
...order,
|
|
4373
|
+
small_ticket_data_flag: 1,
|
|
4374
|
+
payment_info: paymentInfo
|
|
4375
|
+
}, {
|
|
4376
|
+
locales,
|
|
4377
|
+
invoiceTemplateSettings: templateSettings,
|
|
4378
|
+
applyTemplateVisibility: true,
|
|
4379
|
+
includeReceiptKeys: templateSettings !== undefined,
|
|
4380
|
+
refreshResourceReference: true
|
|
4381
|
+
});
|
|
4382
|
+
}
|
|
4235
4383
|
handleLocalOrderReceiptSnapshot = async ({
|
|
4236
4384
|
data
|
|
4237
4385
|
}) => {
|
|
@@ -4275,21 +4423,7 @@ class Server {
|
|
|
4275
4423
|
}
|
|
4276
4424
|
sourceOrder = remoteResult.order;
|
|
4277
4425
|
}
|
|
4278
|
-
const
|
|
4279
|
-
...(sourceOrder.payment_info || {})
|
|
4280
|
-
};
|
|
4281
|
-
delete paymentInfo.small_ticket_data;
|
|
4282
|
-
const rebuiltOrder = await this.withLocalSmallTicketData({
|
|
4283
|
-
...sourceOrder,
|
|
4284
|
-
small_ticket_data_flag: 1,
|
|
4285
|
-
payment_info: paymentInfo
|
|
4286
|
-
}, {
|
|
4287
|
-
locales: this.normalizeRequestedReceiptLocales(input.locales),
|
|
4288
|
-
invoiceTemplateSettings: input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings),
|
|
4289
|
-
applyTemplateVisibility: true,
|
|
4290
|
-
includeReceiptKeys: input.template_settings !== undefined,
|
|
4291
|
-
refreshResourceReference: true
|
|
4292
|
-
});
|
|
4426
|
+
const rebuiltOrder = await this.rebuildOrderReceipt(sourceOrder, input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings), this.normalizeRequestedReceiptLocales(input.locales));
|
|
4293
4427
|
const smallTicketData = rebuiltOrder.payment_info?.small_ticket_data;
|
|
4294
4428
|
if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) {
|
|
4295
4429
|
return {
|
|
@@ -5241,7 +5375,7 @@ class Server {
|
|
|
5241
5375
|
const code = typeof value === 'number' ? value : Number(value);
|
|
5242
5376
|
return Number.isFinite(code) ? code : 500;
|
|
5243
5377
|
}
|
|
5244
|
-
async fetchAndPersistSalesOrderByLookup(lookup, data, title, paymentIdentityOrder) {
|
|
5378
|
+
async fetchAndPersistSalesOrderByLookup(lookup, data, title, paymentIdentityOrder, prepareExactOrderForPersist) {
|
|
5245
5379
|
if (!this.order?.getLocalOrderByLookup || !this.order?.upsertOrdersFromRemote) {
|
|
5246
5380
|
this.logError(`${title}: Order 模块未注册`);
|
|
5247
5381
|
return {
|
|
@@ -5294,7 +5428,7 @@ class Server {
|
|
|
5294
5428
|
order: null
|
|
5295
5429
|
};
|
|
5296
5430
|
}
|
|
5297
|
-
const localBeforeRefresh = this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
|
|
5431
|
+
const localBeforeRefresh = prepareExactOrderForPersist ? this.order.getOrderByOrderId?.(lookup) : this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
|
|
5298
5432
|
let orderToPersist = fresh;
|
|
5299
5433
|
if (paymentIdentityOrder) {
|
|
5300
5434
|
if (String(fresh.order_id) !== String(paymentIdentityOrder.order_id) || fresh.external_sale_number && paymentIdentityOrder.external_sale_number && fresh.external_sale_number !== paymentIdentityOrder.external_sale_number || !Array.isArray(fresh.payments)) {
|
|
@@ -5326,6 +5460,7 @@ class Server {
|
|
|
5326
5460
|
})
|
|
5327
5461
|
};
|
|
5328
5462
|
}
|
|
5463
|
+
if (prepareExactOrderForPersist) orderToPersist = prepareExactOrderForPersist(orderToPersist);
|
|
5329
5464
|
if ((0, _localEftposState.requiresLocalPaymentRefresh)(localBeforeRefresh)) {
|
|
5330
5465
|
if (String(fresh.order_id) !== String(localBeforeRefresh.order_id)) {
|
|
5331
5466
|
throw new Error('远端订单身份不匹配,请重新刷新');
|
|
@@ -5334,7 +5469,9 @@ class Server {
|
|
|
5334
5469
|
} else {
|
|
5335
5470
|
await this.order.upsertOrdersFromRemote([orderToPersist]);
|
|
5336
5471
|
}
|
|
5337
|
-
let savedOrder = await this.order.getLocalOrderByLookup(lookup
|
|
5472
|
+
let savedOrder = prepareExactOrderForPersist ? await this.order.getLocalOrderByLookup(lookup, {
|
|
5473
|
+
exactOrderId: true
|
|
5474
|
+
}) : await this.order.getLocalOrderByLookup(lookup);
|
|
5338
5475
|
if (!savedOrder && fresh.order_id !== undefined && fresh.order_id !== null && String(fresh.order_id) !== String(lookup)) {
|
|
5339
5476
|
savedOrder = await this.order.getLocalOrderByLookup(fresh.order_id);
|
|
5340
5477
|
}
|
|
@@ -109,6 +109,7 @@ export declare class OrderModule extends BaseModule implements Module {
|
|
|
109
109
|
getLocalOrderForPaymentReadiness(lookup: OrderId): Promise<OrderData | null>;
|
|
110
110
|
getLocalOrderByLookup(lookup: OrderId, options?: {
|
|
111
111
|
operationId?: string;
|
|
112
|
+
exactOrderId?: boolean;
|
|
112
113
|
}): Promise<OrderData | null>;
|
|
113
114
|
getLocalPayment(params: {
|
|
114
115
|
saleId: OrderId;
|
|
@@ -678,6 +678,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
678
678
|
}
|
|
679
679
|
async getLocalOrderByLookup(lookup, options = {}) {
|
|
680
680
|
const key = this.getIdKey(lookup);
|
|
681
|
+
const matches = order => options.exactOrderId ? order.order_id != null && this.getIdKey(order.order_id) === key : this.isOrderLookupMatch(order, key);
|
|
681
682
|
const logContext = {
|
|
682
683
|
operation_id: options.operationId,
|
|
683
684
|
lookup: key,
|
|
@@ -687,7 +688,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
687
688
|
this.logInfo('getLocalOrderByLookup-localPayment-开始', logContext);
|
|
688
689
|
}
|
|
689
690
|
const memoryOrderById = this.store.map.get(key);
|
|
690
|
-
if (memoryOrderById) {
|
|
691
|
+
if (memoryOrderById && (!options.exactOrderId || matches(memoryOrderById))) {
|
|
691
692
|
if (options.operationId) {
|
|
692
693
|
this.logInfo('getLocalOrderByLookup-localPayment-命中内存映射', {
|
|
693
694
|
...logContext,
|
|
@@ -696,7 +697,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
696
697
|
}
|
|
697
698
|
return memoryOrderById;
|
|
698
699
|
}
|
|
699
|
-
const memoryOrder = this.store.list.find(
|
|
700
|
+
const memoryOrder = this.store.list.find(matches);
|
|
700
701
|
if (memoryOrder) {
|
|
701
702
|
if (options.operationId) {
|
|
702
703
|
this.logInfo('getLocalOrderByLookup-localPayment-命中内存列表', {
|
|
@@ -710,7 +711,7 @@ class OrderModule extends _BaseModule.BaseModule {
|
|
|
710
711
|
this.logInfo('getLocalOrderByLookup-localPayment-开始读取SQLite', logContext);
|
|
711
712
|
}
|
|
712
713
|
const orders = await this.loadOrdersFromSQLite();
|
|
713
|
-
const localOrder = orders.find(
|
|
714
|
+
const localOrder = orders.find(matches);
|
|
714
715
|
if (!localOrder) {
|
|
715
716
|
if (options.operationId) {
|
|
716
717
|
this.logWarning('getLocalOrderByLookup-localPayment-SQLite未命中', {
|
|
@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
342
342
|
date: string;
|
|
343
343
|
status: string;
|
|
344
344
|
week: string;
|
|
345
|
-
weekNum: 0 | 2 | 1 |
|
|
345
|
+
weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
|
|
346
346
|
}[]>;
|
|
347
347
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
348
348
|
private getScheduleDataByIds;
|
|
@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
|
|
|
2
2
|
import { Module, ModuleOptions, PisellCore } from '../../types';
|
|
3
3
|
import { BaseModule } from '../../modules/BaseModule';
|
|
4
4
|
import type { RequestPlugin } from '../../plugins/request';
|
|
5
|
-
import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams, SalesPrintLocalOrderReceiptOptions } from './types';
|
|
5
|
+
import { SalesState, SalesModuleAPI, Reservation, SalesResourceBookingItem, SalesResourceBookingItemWithGroups, SalesTimelineHighlights, ChangeBookingStatusParams, GetResourceBookingItemParams, SalesPrintLocalOrderReceiptOptions, CloudOrderInvoiceRequest } from './types';
|
|
6
6
|
import type { BookingData } from '../../server/modules/order/types';
|
|
7
7
|
export * from './types';
|
|
8
8
|
/**
|
|
@@ -27,9 +27,6 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
|
|
|
27
27
|
protected request: RequestPlugin;
|
|
28
28
|
private logger;
|
|
29
29
|
private invoiceOpenDataModule;
|
|
30
|
-
private invoiceOpenDataTarget;
|
|
31
|
-
private invoiceOpenDataInFlight;
|
|
32
|
-
private invoiceOpenDataInFlightTarget;
|
|
33
30
|
constructor(name?: string, version?: string);
|
|
34
31
|
initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
|
|
35
32
|
/** 获取当前 store 快照 */
|
|
@@ -51,10 +48,10 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
|
|
|
51
48
|
* Legacy Sales 的系统上下文没有可打印的 system target,因此统一回退 pos。
|
|
52
49
|
*/
|
|
53
50
|
private getInvoiceSalesChannel;
|
|
54
|
-
private loadInvoiceOpenData;
|
|
55
51
|
private logInvoiceOpenDataFallback;
|
|
56
52
|
private resolveInvoiceConfigs;
|
|
57
53
|
printLocalOrderReceipt<T = any>(lookup: string | number, options: SalesPrintLocalOrderReceiptOptions): Promise<T>;
|
|
54
|
+
printCloudOrderInvoice(input: CloudOrderInvoiceRequest): Promise<void>;
|
|
58
55
|
/** 清除独立 Documents 缓存;下一次打印会按当前 target 重新获取。 */
|
|
59
56
|
clearOpenDataCache(): void;
|
|
60
57
|
destroy(): Promise<void>;
|
|
@@ -26,9 +26,6 @@ Object.keys(_types).forEach(function (key) {
|
|
|
26
26
|
var _OpenData = require("../../modules/OpenData");
|
|
27
27
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
28
28
|
const UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
|
|
29
|
-
const INVOICE_OPEN_DATA_SECTION_CODES = ['documents'];
|
|
30
|
-
const INVOICE_OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
|
|
31
|
-
|
|
32
29
|
/**
|
|
33
30
|
* Sales 解决方案基础骨架
|
|
34
31
|
*
|
|
@@ -51,9 +48,6 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
51
48
|
request;
|
|
52
49
|
logger; // LoggerManager 实例
|
|
53
50
|
invoiceOpenDataModule = null;
|
|
54
|
-
invoiceOpenDataTarget = null;
|
|
55
|
-
invoiceOpenDataInFlight = null;
|
|
56
|
-
invoiceOpenDataInFlightTarget = null;
|
|
57
51
|
constructor(name, version) {
|
|
58
52
|
super(name, version);
|
|
59
53
|
}
|
|
@@ -86,9 +80,6 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
86
80
|
// 在这里补充从 Server/Order 读取 currentDay 原始数据并转换为预约列表。
|
|
87
81
|
|
|
88
82
|
this.logger = appPlugin?.getApp().logger;
|
|
89
|
-
this.invoiceOpenDataTarget = null;
|
|
90
|
-
this.invoiceOpenDataInFlight = null;
|
|
91
|
-
this.invoiceOpenDataInFlightTarget = null;
|
|
92
83
|
this.invoiceOpenDataModule = new _OpenData.OpenDataModule(`${this.name}_invoiceOpenData`);
|
|
93
84
|
this.core.registerModule(this.invoiceOpenDataModule, {
|
|
94
85
|
initialState: {},
|
|
@@ -175,51 +166,6 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
175
166
|
const normalized = String(channel ?? contextChannel ?? '').trim();
|
|
176
167
|
return !normalized || normalized === 'system' ? 'pos' : normalized;
|
|
177
168
|
}
|
|
178
|
-
async loadInvoiceOpenData(businessCode, channel) {
|
|
179
|
-
if (!this.invoiceOpenDataModule) {
|
|
180
|
-
throw new Error('Sales Invoice OpenData 模块未初始化');
|
|
181
|
-
}
|
|
182
|
-
const target = `${businessCode}+${channel}`;
|
|
183
|
-
const cachedData = this.invoiceOpenDataModule.getOpenData();
|
|
184
|
-
const lastFetchedAt = this.invoiceOpenDataModule.getLastFetchedAt();
|
|
185
|
-
if (cachedData && this.invoiceOpenDataTarget === target && typeof lastFetchedAt === 'number' && Date.now() - lastFetchedAt < INVOICE_OPEN_DATA_CACHE_TTL) {
|
|
186
|
-
if (typeof this.invoiceOpenDataModule.ensureInvoiceTemplateSettings === 'function') {
|
|
187
|
-
await this.invoiceOpenDataModule.ensureInvoiceTemplateSettings(target);
|
|
188
|
-
}
|
|
189
|
-
return cachedData;
|
|
190
|
-
}
|
|
191
|
-
if (this.invoiceOpenDataInFlight) {
|
|
192
|
-
if (this.invoiceOpenDataInFlightTarget === target) {
|
|
193
|
-
return this.invoiceOpenDataInFlight;
|
|
194
|
-
}
|
|
195
|
-
try {
|
|
196
|
-
await this.invoiceOpenDataInFlight;
|
|
197
|
-
} catch {
|
|
198
|
-
// 另一 target 的失败不应阻断当前 target 获取自己的 Documents 配置。
|
|
199
|
-
}
|
|
200
|
-
return this.loadInvoiceOpenData(businessCode, channel);
|
|
201
|
-
}
|
|
202
|
-
const request = this.invoiceOpenDataModule.fetchOpenData({
|
|
203
|
-
scope: 'board',
|
|
204
|
-
target,
|
|
205
|
-
section_code: [...INVOICE_OPEN_DATA_SECTION_CODES]
|
|
206
|
-
});
|
|
207
|
-
this.invoiceOpenDataInFlight = request;
|
|
208
|
-
this.invoiceOpenDataInFlightTarget = target;
|
|
209
|
-
try {
|
|
210
|
-
const openData = await request;
|
|
211
|
-
// clearOpenDataCache() 或后续请求接管后,旧响应不得复活 target 归属。
|
|
212
|
-
if (this.invoiceOpenDataInFlight === request) {
|
|
213
|
-
this.invoiceOpenDataTarget = target;
|
|
214
|
-
}
|
|
215
|
-
return openData;
|
|
216
|
-
} finally {
|
|
217
|
-
if (this.invoiceOpenDataInFlight === request) {
|
|
218
|
-
this.invoiceOpenDataInFlight = null;
|
|
219
|
-
this.invoiceOpenDataInFlightTarget = null;
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
|
-
}
|
|
223
169
|
logInvoiceOpenDataFallback(error) {
|
|
224
170
|
const message = error instanceof Error ? error.message : String(error);
|
|
225
171
|
if (this.logger?.addLog) {
|
|
@@ -236,16 +182,11 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
236
182
|
}
|
|
237
183
|
async resolveInvoiceConfigs(businessCode, channel) {
|
|
238
184
|
try {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
return {
|
|
242
|
-
invoice: (0, _OpenData.getDefaultInvoiceLayoutConfig)(),
|
|
243
|
-
templateSettings: (0, _OpenData.getDefaultInvoiceTemplateSettings)()
|
|
244
|
-
};
|
|
245
|
-
}
|
|
185
|
+
if (!this.invoiceOpenDataModule) throw new Error('Sales Invoice OpenData 模块未初始化');
|
|
186
|
+
const templateSettings = await this.invoiceOpenDataModule.loadPrintInvoiceTemplate(`${businessCode}+${channel}`, 'manual');
|
|
246
187
|
return {
|
|
247
|
-
invoice:
|
|
248
|
-
templateSettings
|
|
188
|
+
invoice: (0, _OpenData.normalizeInvoiceLayoutFromTemplateSettings)(templateSettings),
|
|
189
|
+
templateSettings
|
|
249
190
|
};
|
|
250
191
|
} catch (error) {
|
|
251
192
|
this.logInvoiceOpenDataFallback(error);
|
|
@@ -287,12 +228,37 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
287
228
|
customToast: () => {}
|
|
288
229
|
});
|
|
289
230
|
}
|
|
231
|
+
async printCloudOrderInvoice(input) {
|
|
232
|
+
const orderId = input?.order_id;
|
|
233
|
+
const channel = typeof input?.channel === 'string' ? input.channel.trim() : '';
|
|
234
|
+
if (!channel) throw new Error('Cloud Invoice requires a channel');
|
|
235
|
+
const openData = this.invoiceOpenDataModule;
|
|
236
|
+
if (!openData) throw new Error('Cloud Invoice is not initialized');
|
|
237
|
+
const requestOptions = {
|
|
238
|
+
osServer: true,
|
|
239
|
+
customToast: () => {}
|
|
240
|
+
};
|
|
241
|
+
const lookup = await this.request.post('/shop/local/cloud-order-invoice/lookup', {
|
|
242
|
+
order_id: orderId
|
|
243
|
+
}, requestOptions);
|
|
244
|
+
if (lookup?.status !== true || lookup.code !== 200) {
|
|
245
|
+
throw new Error(lookup?.message || 'Cloud Invoice order lookup failed');
|
|
246
|
+
}
|
|
247
|
+
const businessCode = lookup.data?.business_code?.trim();
|
|
248
|
+
if (!businessCode) throw new Error('Cloud Invoice order has no business_code');
|
|
249
|
+
const settings = await openData.loadCloudInvoiceTemplate(`${businessCode}+${channel}`);
|
|
250
|
+
const result = await this.request.post('/shop/local/cloud-order-invoice/submit', {
|
|
251
|
+
order_id: orderId,
|
|
252
|
+
business_code: businessCode,
|
|
253
|
+
template_settings: settings
|
|
254
|
+
}, requestOptions);
|
|
255
|
+
if (result?.status !== true || result.code !== 200) {
|
|
256
|
+
throw new Error(result?.message || 'Cloud Invoice dispatch failed');
|
|
257
|
+
}
|
|
258
|
+
}
|
|
290
259
|
|
|
291
260
|
/** 清除独立 Documents 缓存;下一次打印会按当前 target 重新获取。 */
|
|
292
261
|
clearOpenDataCache() {
|
|
293
|
-
this.invoiceOpenDataInFlight = null;
|
|
294
|
-
this.invoiceOpenDataInFlightTarget = null;
|
|
295
|
-
this.invoiceOpenDataTarget = null;
|
|
296
262
|
this.invoiceOpenDataModule?.clearCache();
|
|
297
263
|
}
|
|
298
264
|
|
|
@@ -56,6 +56,11 @@ export interface SalesPrintLocalOrderReceiptOptions {
|
|
|
56
56
|
/** 当前销售入口;缺失或为 system 时按 pos 处理。 */
|
|
57
57
|
channel?: string;
|
|
58
58
|
}
|
|
59
|
+
/** Native cloud-order notification. */
|
|
60
|
+
export interface CloudOrderInvoiceRequest {
|
|
61
|
+
order_id: string | number;
|
|
62
|
+
channel: string;
|
|
63
|
+
}
|
|
59
64
|
/**
|
|
60
65
|
* Sales 解决方案状态
|
|
61
66
|
*
|
|
@@ -90,6 +95,7 @@ export interface SalesModuleAPI {
|
|
|
90
95
|
changeBookingStatus: (params: ChangeBookingStatusParams) => Promise<any>;
|
|
91
96
|
/** 按本地订单标识打印小票;本地未命中时由 OS Server 负责远端兜底。 */
|
|
92
97
|
printLocalOrderReceipt: <T = any>(lookup: string | number, options: SalesPrintLocalOrderReceiptOptions) => Promise<T>;
|
|
98
|
+
printCloudOrderInvoice: (request: CloudOrderInvoiceRequest) => Promise<void>;
|
|
93
99
|
/** 清除 Legacy Sales 独立维护的 Documents OpenData 缓存。 */
|
|
94
100
|
clearOpenDataCache: () => void;
|
|
95
101
|
/** 获取资源维度的预约占用列表 */
|