@pisell/pisellos 0.10.95 → 0.10.97
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/model/strategy/adapter/promotion/index.js +9 -0
- package/dist/modules/OpenData/index.d.ts +3 -0
- package/dist/modules/OpenData/index.js +160 -84
- package/dist/modules/Order/index.d.ts +1 -1
- 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 +2 -2
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/dist/solution/BookingTicket/utils/redeemArrival.d.ts +16 -16
- package/dist/solution/Sales/index.d.ts +2 -1
- package/dist/solution/Sales/index.js +123 -49
- package/dist/solution/Sales/types.d.ts +6 -0
- package/dist/solution/Sales/types.js +2 -0
- package/lib/model/strategy/adapter/promotion/index.js +46 -1
- package/lib/modules/OpenData/index.d.ts +3 -0
- package/lib/modules/OpenData/index.js +51 -18
- package/lib/modules/Order/index.d.ts +1 -1
- 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 +2 -2
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/lib/solution/BookingTicket/utils/redeemArrival.d.ts +16 -16
- package/lib/solution/Sales/index.d.ts +2 -1
- package/lib/solution/Sales/index.js +28 -1
- 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.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',
|
|
@@ -4133,6 +4145,125 @@ class Server {
|
|
|
4133
4145
|
external_sale_number: localOrder.external_sale_number ?? definedInput.external_sale_number ?? definedInput.externalSaleNumber
|
|
4134
4146
|
};
|
|
4135
4147
|
}
|
|
4148
|
+
async loadCloudInvoiceOrder(orderId, shopId, assertCurrentShop) {
|
|
4149
|
+
if (!this.order) throw new Error('Cloud invoice order service is unavailable');
|
|
4150
|
+
const hasReceiptDetail = order => {
|
|
4151
|
+
// Use the same amount fields as the receipt builder, including historical
|
|
4152
|
+
// top-level amounts. Zero is a valid total; a missing total in a list row is not.
|
|
4153
|
+
const total = [order.summary?.expect_amount, order.expect_amount, order.summary?.total_amount, order.total_amount].find(value => value != null && value !== '');
|
|
4154
|
+
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));
|
|
4155
|
+
};
|
|
4156
|
+
const local = await this.order.getLocalOrderByLookup(orderId, {
|
|
4157
|
+
exactOrderId: true
|
|
4158
|
+
});
|
|
4159
|
+
assertCurrentShop();
|
|
4160
|
+
if (local && String(local.order_id) === orderId) {
|
|
4161
|
+
if (local.shop_id != null && String(local.shop_id) !== shopId) {
|
|
4162
|
+
throw new Error('Cloud invoice order belongs to another shop');
|
|
4163
|
+
}
|
|
4164
|
+
if (String(local.shop_id) === shopId && hasReceiptDetail(local)) return local;
|
|
4165
|
+
}
|
|
4166
|
+
|
|
4167
|
+
// The generic detail route also matches short receipt numbers. Validate the
|
|
4168
|
+
// backend identity and live shop BEFORE its result enters the shared store.
|
|
4169
|
+
const result = await this.fetchAndPersistSalesOrderByLookup(orderId, {
|
|
4170
|
+
with: ['all']
|
|
4171
|
+
}, 'cloudOrderInvoice', undefined, fresh => {
|
|
4172
|
+
assertCurrentShop();
|
|
4173
|
+
if (String(fresh.order_id) !== orderId || fresh.shop_id != null && String(fresh.shop_id) !== shopId || !hasReceiptDetail(fresh)) {
|
|
4174
|
+
throw new Error('Cloud invoice order identity or detail is invalid');
|
|
4175
|
+
}
|
|
4176
|
+
// Some older shop-authenticated detail responses omit shop_id.
|
|
4177
|
+
return fresh.shop_id == null ? {
|
|
4178
|
+
...fresh,
|
|
4179
|
+
shop_id: Number(shopId)
|
|
4180
|
+
} : fresh;
|
|
4181
|
+
});
|
|
4182
|
+
assertCurrentShop();
|
|
4183
|
+
const saved = result.order;
|
|
4184
|
+
if (!saved || String(saved.order_id) !== orderId || String(saved.shop_id) !== shopId || !hasReceiptDetail(saved)) {
|
|
4185
|
+
throw new Error(result.message || 'Cloud invoice order detail is unavailable');
|
|
4186
|
+
}
|
|
4187
|
+
return saved;
|
|
4188
|
+
}
|
|
4189
|
+
async handleCloudOrderInvoice(input, submit) {
|
|
4190
|
+
const orderId = typeof input?.order_id === 'string' ? input.order_id.trim() : Number.isSafeInteger(input?.order_id) ? String(input.order_id) : '';
|
|
4191
|
+
if (!/^[1-9]\d*$/.test(orderId)) {
|
|
4192
|
+
return {
|
|
4193
|
+
code: 400,
|
|
4194
|
+
status: false,
|
|
4195
|
+
message: 'Invalid cloud invoice order ID',
|
|
4196
|
+
data: null
|
|
4197
|
+
};
|
|
4198
|
+
}
|
|
4199
|
+
try {
|
|
4200
|
+
const shopId = String(this.getAppData('shop_id') ?? '');
|
|
4201
|
+
const tenantId = String(this.getAppData('tenant_id') ?? '');
|
|
4202
|
+
if (!/^[1-9]\d*$/.test(shopId) || !Number.isSafeInteger(Number(shopId))) {
|
|
4203
|
+
throw new Error('Cloud invoice shop is unavailable');
|
|
4204
|
+
}
|
|
4205
|
+
const assertCurrentShop = () => {
|
|
4206
|
+
if (String(this.getAppData('shop_id') ?? '') !== shopId || String(this.getAppData('tenant_id') ?? '') !== tenantId) {
|
|
4207
|
+
throw new Error('Cloud invoice shop context changed');
|
|
4208
|
+
}
|
|
4209
|
+
};
|
|
4210
|
+
const order = await this.loadCloudInvoiceOrder(orderId, shopId, assertCurrentShop);
|
|
4211
|
+
const businessCode = order.business_code.trim();
|
|
4212
|
+
if (!submit) return {
|
|
4213
|
+
code: 200,
|
|
4214
|
+
status: true,
|
|
4215
|
+
message: '',
|
|
4216
|
+
data: {
|
|
4217
|
+
business_code: businessCode
|
|
4218
|
+
}
|
|
4219
|
+
};
|
|
4220
|
+
if (input.business_code !== businessCode || typeof input.template_settings?.template !== 'string' || !input.template_settings.template.trim() || !Array.isArray(input.template_settings.modules)) {
|
|
4221
|
+
throw new Error('Cloud invoice template is missing or belongs to another business');
|
|
4222
|
+
}
|
|
4223
|
+
const settings = this.normalizePrintInvoiceTemplateSettings(input.template_settings);
|
|
4224
|
+
const receipt = await this.rebuildOrderReceipt(order, settings);
|
|
4225
|
+
const smallTicketData = receipt.payment_info?.small_ticket_data;
|
|
4226
|
+
if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) throw new Error('Cloud invoice snapshot is unavailable');
|
|
4227
|
+
const deviceTask = this.getDeviceTaskPlugin();
|
|
4228
|
+
if (!deviceTask?.dispatch) throw new Error('Print task service is unavailable');
|
|
4229
|
+
const deviceId = await this.getShortNumberOrDeviceId();
|
|
4230
|
+
assertCurrentShop();
|
|
4231
|
+
await deviceTask.dispatch({
|
|
4232
|
+
action: 'print_all',
|
|
4233
|
+
device_id: deviceId,
|
|
4234
|
+
name: 'PRINT_V1',
|
|
4235
|
+
source: 'server',
|
|
4236
|
+
source_type: 'order',
|
|
4237
|
+
source_id: order.order_id,
|
|
4238
|
+
payload: {
|
|
4239
|
+
type: '0',
|
|
4240
|
+
template_settings: settings,
|
|
4241
|
+
data: {
|
|
4242
|
+
order_id: order.order_id,
|
|
4243
|
+
small_ticket_data: smallTicketData
|
|
4244
|
+
}
|
|
4245
|
+
}
|
|
4246
|
+
});
|
|
4247
|
+
return {
|
|
4248
|
+
code: 200,
|
|
4249
|
+
status: true,
|
|
4250
|
+
message: '',
|
|
4251
|
+
data: null
|
|
4252
|
+
};
|
|
4253
|
+
} catch (error) {
|
|
4254
|
+
const message = this.getUnknownErrorMessage(error);
|
|
4255
|
+
this.logWarning('Cloud invoice request failed', {
|
|
4256
|
+
orderId,
|
|
4257
|
+
message
|
|
4258
|
+
});
|
|
4259
|
+
return {
|
|
4260
|
+
code: 500,
|
|
4261
|
+
status: false,
|
|
4262
|
+
message,
|
|
4263
|
+
data: null
|
|
4264
|
+
};
|
|
4265
|
+
}
|
|
4266
|
+
}
|
|
4136
4267
|
handleLocalPrintOrder = async ({
|
|
4137
4268
|
data
|
|
4138
4269
|
}) => {
|
|
@@ -4265,6 +4396,23 @@ class Server {
|
|
|
4265
4396
|
if (!Array.isArray(value)) return [];
|
|
4266
4397
|
return Array.from(new Set(value.filter(locale => typeof locale === 'string').map(locale => locale.trim()).filter(Boolean)));
|
|
4267
4398
|
}
|
|
4399
|
+
rebuildOrderReceipt(order, templateSettings, locales) {
|
|
4400
|
+
const paymentInfo = {
|
|
4401
|
+
...order.payment_info
|
|
4402
|
+
};
|
|
4403
|
+
delete paymentInfo.small_ticket_data;
|
|
4404
|
+
return this.withLocalSmallTicketData({
|
|
4405
|
+
...order,
|
|
4406
|
+
small_ticket_data_flag: 1,
|
|
4407
|
+
payment_info: paymentInfo
|
|
4408
|
+
}, {
|
|
4409
|
+
locales,
|
|
4410
|
+
invoiceTemplateSettings: templateSettings,
|
|
4411
|
+
applyTemplateVisibility: true,
|
|
4412
|
+
includeReceiptKeys: templateSettings !== undefined,
|
|
4413
|
+
refreshResourceReference: true
|
|
4414
|
+
});
|
|
4415
|
+
}
|
|
4268
4416
|
handleLocalOrderReceiptSnapshot = async ({
|
|
4269
4417
|
data
|
|
4270
4418
|
}) => {
|
|
@@ -4308,21 +4456,7 @@ class Server {
|
|
|
4308
4456
|
}
|
|
4309
4457
|
sourceOrder = remoteResult.order;
|
|
4310
4458
|
}
|
|
4311
|
-
const
|
|
4312
|
-
...(sourceOrder.payment_info || {})
|
|
4313
|
-
};
|
|
4314
|
-
delete paymentInfo.small_ticket_data;
|
|
4315
|
-
const rebuiltOrder = await this.withLocalSmallTicketData({
|
|
4316
|
-
...sourceOrder,
|
|
4317
|
-
small_ticket_data_flag: 1,
|
|
4318
|
-
payment_info: paymentInfo
|
|
4319
|
-
}, {
|
|
4320
|
-
locales: this.normalizeRequestedReceiptLocales(input.locales),
|
|
4321
|
-
invoiceTemplateSettings: input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings),
|
|
4322
|
-
applyTemplateVisibility: true,
|
|
4323
|
-
includeReceiptKeys: input.template_settings !== undefined,
|
|
4324
|
-
refreshResourceReference: true
|
|
4325
|
-
});
|
|
4459
|
+
const rebuiltOrder = await this.rebuildOrderReceipt(sourceOrder, input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings), this.normalizeRequestedReceiptLocales(input.locales));
|
|
4326
4460
|
const smallTicketData = rebuiltOrder.payment_info?.small_ticket_data;
|
|
4327
4461
|
if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) {
|
|
4328
4462
|
return {
|
|
@@ -5274,7 +5408,7 @@ class Server {
|
|
|
5274
5408
|
const code = typeof value === 'number' ? value : Number(value);
|
|
5275
5409
|
return Number.isFinite(code) ? code : 500;
|
|
5276
5410
|
}
|
|
5277
|
-
async fetchAndPersistSalesOrderByLookup(lookup, data, title, paymentIdentityOrder) {
|
|
5411
|
+
async fetchAndPersistSalesOrderByLookup(lookup, data, title, paymentIdentityOrder, prepareExactOrderForPersist) {
|
|
5278
5412
|
if (!this.order?.getLocalOrderByLookup || !this.order?.upsertOrdersFromRemote) {
|
|
5279
5413
|
this.logError(`${title}: Order 模块未注册`);
|
|
5280
5414
|
return {
|
|
@@ -5327,7 +5461,7 @@ class Server {
|
|
|
5327
5461
|
order: null
|
|
5328
5462
|
};
|
|
5329
5463
|
}
|
|
5330
|
-
const localBeforeRefresh = this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
|
|
5464
|
+
const localBeforeRefresh = prepareExactOrderForPersist ? this.order.getOrderByOrderId?.(lookup) : this.order.getLocalOrderFromMemoryByLookup?.(lookup) || (this.shouldForceRemoteSalesDetail(data) ? await this.order.getLocalOrderByLookup(lookup) : null);
|
|
5331
5465
|
let orderToPersist = fresh;
|
|
5332
5466
|
if (paymentIdentityOrder) {
|
|
5333
5467
|
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)) {
|
|
@@ -5359,6 +5493,7 @@ class Server {
|
|
|
5359
5493
|
})
|
|
5360
5494
|
};
|
|
5361
5495
|
}
|
|
5496
|
+
if (prepareExactOrderForPersist) orderToPersist = prepareExactOrderForPersist(orderToPersist);
|
|
5362
5497
|
if ((0, _localEftposState.requiresLocalPaymentRefresh)(localBeforeRefresh)) {
|
|
5363
5498
|
if (String(fresh.order_id) !== String(localBeforeRefresh.order_id)) {
|
|
5364
5499
|
throw new Error('远端订单身份不匹配,请重新刷新');
|
|
@@ -5367,7 +5502,9 @@ class Server {
|
|
|
5367
5502
|
} else {
|
|
5368
5503
|
await this.order.upsertOrdersFromRemote([orderToPersist]);
|
|
5369
5504
|
}
|
|
5370
|
-
let savedOrder = await this.order.getLocalOrderByLookup(lookup
|
|
5505
|
+
let savedOrder = prepareExactOrderForPersist ? await this.order.getLocalOrderByLookup(lookup, {
|
|
5506
|
+
exactOrderId: true
|
|
5507
|
+
}) : await this.order.getLocalOrderByLookup(lookup);
|
|
5371
5508
|
if (!savedOrder && fresh.order_id !== undefined && fresh.order_id !== null && String(fresh.order_id) !== String(lookup)) {
|
|
5372
5509
|
savedOrder = await this.order.getLocalOrderByLookup(fresh.order_id);
|
|
5373
5510
|
}
|
|
@@ -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 |
|
|
345
|
+
weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
|
|
346
346
|
}[]>;
|
|
347
347
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
348
348
|
private getScheduleDataByIds;
|
|
@@ -361,7 +361,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
361
361
|
count: number;
|
|
362
362
|
left: number;
|
|
363
363
|
summaryCount: number;
|
|
364
|
-
status: "
|
|
364
|
+
status: "lots_of_space" | "filling_up_fast" | "sold_out";
|
|
365
365
|
}[];
|
|
366
366
|
/**
|
|
367
367
|
* 找到多个资源的公共可用时间段
|
|
@@ -366,7 +366,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
366
366
|
* 获取当前的客户搜索条件
|
|
367
367
|
* @returns 当前搜索条件
|
|
368
368
|
*/
|
|
369
|
-
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "
|
|
369
|
+
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
|
|
370
370
|
/**
|
|
371
371
|
* 获取客户列表状态(包含滚动加载相关状态)
|
|
372
372
|
* @returns 客户状态
|
|
@@ -24,23 +24,19 @@ export declare function buildArrivalCheckoutQuery(order: OrderTempOrder, summary
|
|
|
24
24
|
products: import("../../../modules/Order/types").OrderSubmitProduct[];
|
|
25
25
|
notes?: import("../../../modules/Order/types").SalesNote[] | undefined;
|
|
26
26
|
summary?: import("../../../modules/Order/types").OrderSummary | undefined;
|
|
27
|
-
|
|
28
|
-
type: string;
|
|
29
|
-
note: string;
|
|
30
|
-
holder: Record<string, any> | null;
|
|
31
|
-
relation_forms: any[];
|
|
32
|
-
holder_relations?: import("../../../modules/Order/types").OrderHolderRelation[] | undefined;
|
|
33
|
-
order_id: number | null;
|
|
27
|
+
bookings: any[];
|
|
34
28
|
external_sale_number: string;
|
|
29
|
+
payments: any[];
|
|
30
|
+
customer_id: number | null;
|
|
31
|
+
order_id: number | null;
|
|
35
32
|
order_number: string | null;
|
|
36
33
|
shop_order_number: string | null;
|
|
37
|
-
|
|
34
|
+
type: string;
|
|
38
35
|
business_code?: string | undefined;
|
|
39
36
|
sales_channel: string;
|
|
40
37
|
order_sales_channel: string;
|
|
41
38
|
status: string;
|
|
42
39
|
shipping_status: string;
|
|
43
|
-
customer_id: number | null;
|
|
44
40
|
customer_name: string;
|
|
45
41
|
country_calling_code: string;
|
|
46
42
|
phone: string;
|
|
@@ -55,17 +51,21 @@ export declare function buildArrivalCheckoutQuery(order: OrderTempOrder, summary
|
|
|
55
51
|
deposit_amount: string;
|
|
56
52
|
shop_discount: string;
|
|
57
53
|
surcharge_fee: string;
|
|
58
|
-
|
|
59
|
-
delivery_type?: string | undefined;
|
|
60
|
-
table_number?: Record<string, any> | undefined;
|
|
54
|
+
note: string;
|
|
61
55
|
schedule_date: string;
|
|
62
|
-
bookings: any[];
|
|
63
|
-
payments: any[];
|
|
64
|
-
contacts_info: Record<string, any> | null;
|
|
65
|
-
order_meta_list?: import("../../../modules/Order/types").OrderMetaList | undefined;
|
|
66
56
|
refunds?: any[] | undefined;
|
|
67
57
|
surcharges: any[];
|
|
58
|
+
relation_forms: any[];
|
|
68
59
|
contacts: any[];
|
|
60
|
+
contacts_info: Record<string, any> | null;
|
|
61
|
+
holder: Record<string, any> | null;
|
|
62
|
+
holder_relations?: import("../../../modules/Order/types").OrderHolderRelation[] | undefined;
|
|
63
|
+
order_meta_list?: import("../../../modules/Order/types").OrderMetaList | undefined;
|
|
64
|
+
metadata: Record<string, any>;
|
|
65
|
+
buzzer?: string | undefined;
|
|
66
|
+
shop_full_order_number: string | null;
|
|
67
|
+
delivery_type?: string | undefined;
|
|
68
|
+
table_number?: Record<string, any> | undefined;
|
|
69
69
|
};
|
|
70
70
|
export declare function describeChangedBookings(before: OrderTempOrder['bookings'], after: OrderTempOrder['bookings']): {
|
|
71
71
|
schedule_event_id: any;
|
|
@@ -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
|
/**
|
|
@@ -55,6 +55,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
|
|
|
55
55
|
private logInvoiceOpenDataFallback;
|
|
56
56
|
private resolveInvoiceConfigs;
|
|
57
57
|
printLocalOrderReceipt<T = any>(lookup: string | number, options: SalesPrintLocalOrderReceiptOptions): Promise<T>;
|
|
58
|
+
printCloudOrderInvoice(input: CloudOrderInvoiceRequest): Promise<void>;
|
|
58
59
|
/** 清除独立 Documents 缓存;下一次打印会按当前 target 重新获取。 */
|
|
59
60
|
clearOpenDataCache(): void;
|
|
60
61
|
destroy(): Promise<void>;
|
|
@@ -28,7 +28,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
28
28
|
const UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
|
|
29
29
|
const INVOICE_OPEN_DATA_SECTION_CODES = ['documents'];
|
|
30
30
|
const INVOICE_OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
|
|
31
|
-
|
|
32
31
|
/**
|
|
33
32
|
* Sales 解决方案基础骨架
|
|
34
33
|
*
|
|
@@ -287,6 +286,34 @@ class SalesImpl extends _BaseModule.BaseModule {
|
|
|
287
286
|
customToast: () => {}
|
|
288
287
|
});
|
|
289
288
|
}
|
|
289
|
+
async printCloudOrderInvoice(input) {
|
|
290
|
+
const orderId = input?.order_id;
|
|
291
|
+
const channel = typeof input?.channel === 'string' ? input.channel.trim() : '';
|
|
292
|
+
if (!channel) throw new Error('Cloud Invoice requires a channel');
|
|
293
|
+
const openData = this.invoiceOpenDataModule;
|
|
294
|
+
if (!openData) throw new Error('Cloud Invoice is not initialized');
|
|
295
|
+
const requestOptions = {
|
|
296
|
+
osServer: true,
|
|
297
|
+
customToast: () => {}
|
|
298
|
+
};
|
|
299
|
+
const lookup = await this.request.post('/shop/local/cloud-order-invoice/lookup', {
|
|
300
|
+
order_id: orderId
|
|
301
|
+
}, requestOptions);
|
|
302
|
+
if (lookup?.status !== true || lookup.code !== 200) {
|
|
303
|
+
throw new Error(lookup?.message || 'Cloud Invoice order lookup failed');
|
|
304
|
+
}
|
|
305
|
+
const businessCode = lookup.data?.business_code?.trim();
|
|
306
|
+
if (!businessCode) throw new Error('Cloud Invoice order has no business_code');
|
|
307
|
+
const settings = await openData.loadCloudInvoiceTemplate(`${businessCode}+${channel}`);
|
|
308
|
+
const result = await this.request.post('/shop/local/cloud-order-invoice/submit', {
|
|
309
|
+
order_id: orderId,
|
|
310
|
+
business_code: businessCode,
|
|
311
|
+
template_settings: settings
|
|
312
|
+
}, requestOptions);
|
|
313
|
+
if (result?.status !== true || result.code !== 200) {
|
|
314
|
+
throw new Error(result?.message || 'Cloud Invoice dispatch failed');
|
|
315
|
+
}
|
|
316
|
+
}
|
|
290
317
|
|
|
291
318
|
/** 清除独立 Documents 缓存;下一次打印会按当前 target 重新获取。 */
|
|
292
319
|
clearOpenDataCache() {
|
|
@@ -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
|
/** 获取资源维度的预约占用列表 */
|