@pisell/pisellos 2.3.21 → 2.3.23
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/Order/index.d.ts +2 -1
- package/dist/modules/Order/index.js +27 -12
- package/dist/modules/Order/utils.d.ts +2 -2
- package/dist/modules/Order/utils.js +41 -49
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.js +40 -6
- package/dist/server/modules/order/types.d.ts +2 -0
- package/dist/solution/BaseSales/index.d.ts +12 -0
- package/dist/solution/BaseSales/index.js +384 -320
- package/dist/solution/BaseSales/types.d.ts +4 -1
- package/dist/solution/BaseSales/types.js +1 -1
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +12 -1
- package/dist/solution/BookingByStep/index.d.ts +2 -2
- package/dist/solution/BookingTicket/index.js +42 -24
- package/lib/modules/Order/index.d.ts +2 -1
- package/lib/modules/Order/index.js +15 -3
- package/lib/modules/Order/utils.d.ts +2 -2
- package/lib/modules/Order/utils.js +7 -5
- package/lib/server/index.d.ts +1 -0
- package/lib/server/index.js +41 -3
- package/lib/server/modules/order/types.d.ts +2 -0
- package/lib/solution/BaseSales/index.d.ts +12 -0
- package/lib/solution/BaseSales/index.js +31 -2
- package/lib/solution/BaseSales/types.d.ts +4 -1
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +7 -1
- package/lib/solution/BookingByStep/index.d.ts +2 -2
- package/lib/solution/BookingTicket/index.js +15 -7
- package/package.json +1 -1
|
@@ -341,15 +341,21 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
|
|
|
341
341
|
if (!this.store.order)
|
|
342
342
|
throw new Error("order 模块未初始化");
|
|
343
343
|
const raw = await this.store.order.scanCode(code, customerId);
|
|
344
|
+
const scannedList = raw.scannedDiscountList || [];
|
|
345
|
+
const extractedCustomerId = this.getDiscountCustomerId(scannedList);
|
|
346
|
+
const hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
|
|
347
|
+
if (!hasOrderCustomer && extractedCustomerId) {
|
|
348
|
+
await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
|
|
349
|
+
}
|
|
344
350
|
if (raw.isAvailable) {
|
|
345
|
-
await this.hydrateOrderCustomerFromScanDiscounts(raw.scannedDiscountList || []);
|
|
346
351
|
await this.store.order.recalculateSummary({ createIfMissing: true });
|
|
347
352
|
this.store.order.persistTempOrder();
|
|
348
353
|
}
|
|
349
354
|
return {
|
|
350
355
|
isAvailable: raw.isAvailable,
|
|
351
356
|
type: raw.type,
|
|
352
|
-
unavailableReason: raw.unavailableReason
|
|
357
|
+
unavailableReason: raw.unavailableReason,
|
|
358
|
+
scannedDiscountList: raw.scannedDiscountList
|
|
353
359
|
};
|
|
354
360
|
}
|
|
355
361
|
async hydrateOrderCustomerFromScanDiscounts(discounts) {
|
|
@@ -366,11 +372,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
|
|
|
366
372
|
this.setOrderCustomer(customer);
|
|
367
373
|
}
|
|
368
374
|
getDiscountCustomerId(discounts) {
|
|
369
|
-
const
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
375
|
+
for (const item of discounts) {
|
|
376
|
+
const topLevelId = Number(item.customer_id);
|
|
377
|
+
if (Number.isFinite(topLevelId) && topLevelId > 0) {
|
|
378
|
+
return topLevelId;
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
return null;
|
|
374
382
|
}
|
|
375
383
|
async resolveCustomerByDiscountCustomerId(customerId) {
|
|
376
384
|
var _a;
|