@pisell/pisellos 0.10.88 → 0.10.91
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/itemRule/adapter.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/adapter.js +74 -7
- package/dist/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/evaluator.js +13 -0
- package/dist/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/dist/model/strategy/adapter/itemRule/type.js +10 -0
- package/dist/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/dist/model/strategy/adapter/promotion/evaluator.js +103 -112
- package/dist/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/dist/modules/BookingContext/utils/calendarBooking.js +207 -0
- package/dist/modules/BookingContext/utils/index.d.ts +1 -0
- package/dist/modules/BookingContext/utils/index.js +1 -0
- package/dist/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/dist/modules/BookingContext/utils/productExtend.js +132 -33
- package/dist/modules/BookingContext/utils/resources.js +1 -1
- package/dist/modules/Cart/index.js +4 -3
- package/dist/modules/Cart/types.d.ts +2 -0
- package/dist/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/dist/modules/Cart/utils/cartProduct.js +59 -32
- package/dist/modules/Date/index.d.ts +1 -1
- package/dist/modules/Date/index.js +60 -14
- package/dist/modules/Date/types.d.ts +5 -0
- package/dist/modules/OpenData/salesSettings.js +1 -1
- package/dist/modules/OpenData/types.d.ts +9 -0
- package/dist/modules/OpenData/utils.d.ts +1 -1
- package/dist/modules/OpenData/utils.js +3 -2
- package/dist/modules/Order/index.d.ts +22 -7
- package/dist/modules/Order/index.js +1565 -1161
- package/dist/modules/Order/localEftposState.d.ts +13 -0
- package/dist/modules/Order/localEftposState.js +39 -0
- package/dist/modules/Order/types.d.ts +33 -11
- package/dist/modules/Order/types.js +2 -2
- package/dist/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/dist/modules/Order/unpaidAmountGap.js +72 -0
- package/dist/modules/Order/utils.d.ts +4 -1
- package/dist/modules/Order/utils.js +185 -129
- package/dist/modules/Payment/walletpass.js +32 -6
- package/dist/modules/Product/types.d.ts +16 -0
- package/dist/modules/ProductList/index.js +1 -1
- package/dist/modules/ResourcePlanner/planner.d.ts +2 -0
- package/dist/modules/ResourcePlanner/planner.js +383 -24
- package/dist/modules/ResourcePlanner/types.d.ts +42 -0
- package/dist/modules/Rules/index.js +86 -54
- package/dist/modules/Schedule/index.d.ts +7 -1
- package/dist/modules/Schedule/index.js +155 -39
- package/dist/modules/Schedule/types.d.ts +2 -0
- package/dist/modules/bookingReadValidation.d.ts +6 -0
- package/dist/modules/bookingReadValidation.js +72 -0
- package/dist/plugins/request.d.ts +2 -0
- package/dist/server/index.d.ts +9 -0
- package/dist/server/index.js +1928 -1462
- package/dist/server/modules/form/index.d.ts +19 -0
- package/dist/server/modules/form/index.js +205 -0
- package/dist/server/modules/form/types.d.ts +13 -0
- package/dist/server/modules/form/types.js +3 -0
- package/dist/server/modules/index.d.ts +3 -0
- package/dist/server/modules/index.js +4 -0
- package/dist/server/modules/order/index.d.ts +21 -0
- package/dist/server/modules/order/index.js +1399 -831
- package/dist/server/modules/order/types.d.ts +3 -0
- package/dist/server/modules/order/utils/filterOrders.js +20 -0
- package/dist/server/modules/products/index.d.ts +28 -7
- package/dist/server/modules/products/index.js +1295 -769
- package/dist/server/modules/products/replication.d.ts +8 -0
- package/dist/server/modules/products/replication.js +69 -0
- package/dist/server/modules/products/types.d.ts +12 -1
- package/dist/server/modules/products/types.js +4 -0
- package/dist/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/dist/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/dist/shared/receipt/small-ticket.d.ts +1 -0
- package/dist/shared/receipt/small-ticket.js +58 -26
- package/dist/shared/receipt/templateVisibility.d.ts +3 -0
- package/dist/shared/receipt/templateVisibility.js +6 -2
- package/dist/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/dist/solution/BaseSales/fulfillmentItemRules.js +750 -0
- package/dist/solution/BaseSales/index.d.ts +22 -6
- package/dist/solution/BaseSales/index.js +1881 -1347
- package/dist/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/dist/solution/BaseSales/pickupTiming.js +35 -8
- package/dist/solution/BaseSales/types.d.ts +4 -0
- package/dist/solution/BaseSales/types.js +1 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.js +174 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +8 -8
- package/dist/solution/BookingByStep/index.d.ts +19 -3
- package/dist/solution/BookingByStep/index.js +681 -361
- package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/dist/solution/BookingByStep/utils/resources.js +117 -76
- package/dist/solution/BookingTicket/index.d.ts +6 -0
- package/dist/solution/BookingTicket/index.js +666 -593
- package/dist/solution/BookingTicket/types.d.ts +1 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.js +35 -8
- package/dist/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.js +188 -0
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +58 -94
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +33 -62
- package/dist/solution/OrderInvoicePreview/index.js +4 -3
- package/dist/solution/Sales/index.js +1 -1
- package/dist/solution/ScanOrder/index.d.ts +2 -0
- package/dist/solution/ScanOrder/index.js +230 -97
- package/dist/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/dist/solution/ScanOrder/menuAvailability.js +363 -0
- package/dist/solution/ScanOrder/types.d.ts +3 -0
- package/dist/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/dist/solution/UnifiedBookingSales/index.js +2493 -1496
- package/dist/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/dist/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/dist/utils/pos-receipt-auto-print.d.ts +4 -0
- package/dist/utils/pos-receipt-auto-print.js +14 -0
- package/lib/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/adapter.js +54 -4
- package/lib/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/evaluator.js +9 -0
- package/lib/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/lib/model/strategy/adapter/itemRule/type.js +10 -0
- package/lib/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/lib/model/strategy/adapter/promotion/evaluator.js +22 -21
- package/lib/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/lib/modules/BookingContext/utils/calendarBooking.js +156 -0
- package/lib/modules/BookingContext/utils/index.d.ts +1 -0
- package/lib/modules/BookingContext/utils/index.js +11 -0
- package/lib/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/lib/modules/BookingContext/utils/productExtend.js +104 -5
- package/lib/modules/BookingContext/utils/resources.js +1 -1
- package/lib/modules/Cart/index.js +4 -2
- package/lib/modules/Cart/types.d.ts +2 -0
- package/lib/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/lib/modules/Cart/utils/cartProduct.js +39 -20
- package/lib/modules/Date/index.d.ts +1 -1
- package/lib/modules/Date/index.js +28 -5
- package/lib/modules/Date/types.d.ts +5 -0
- package/lib/modules/OpenData/salesSettings.js +1 -1
- package/lib/modules/OpenData/types.d.ts +9 -0
- package/lib/modules/OpenData/utils.d.ts +1 -1
- package/lib/modules/OpenData/utils.js +3 -2
- package/lib/modules/Order/index.d.ts +22 -7
- package/lib/modules/Order/index.js +457 -174
- package/lib/modules/Order/localEftposState.d.ts +13 -0
- package/lib/modules/Order/localEftposState.js +44 -0
- package/lib/modules/Order/types.d.ts +33 -11
- package/lib/modules/Order/types.js +2 -2
- package/lib/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/lib/modules/Order/unpaidAmountGap.js +60 -0
- package/lib/modules/Order/utils.d.ts +4 -1
- package/lib/modules/Order/utils.js +51 -3
- package/lib/modules/Payment/walletpass.js +23 -1
- package/lib/modules/Product/types.d.ts +16 -0
- package/lib/modules/ProductList/index.js +1 -1
- package/lib/modules/ResourcePlanner/planner.d.ts +2 -0
- package/lib/modules/ResourcePlanner/planner.js +299 -9
- package/lib/modules/ResourcePlanner/types.d.ts +42 -0
- package/lib/modules/Rules/index.js +32 -3
- package/lib/modules/Schedule/index.d.ts +7 -1
- package/lib/modules/Schedule/index.js +68 -4
- package/lib/modules/Schedule/types.d.ts +2 -0
- package/lib/modules/bookingReadValidation.d.ts +6 -0
- package/lib/modules/bookingReadValidation.js +56 -0
- package/lib/plugins/request.d.ts +2 -0
- package/lib/server/index.d.ts +9 -0
- package/lib/server/index.js +279 -30
- package/lib/server/modules/form/index.d.ts +19 -0
- package/lib/server/modules/form/index.js +73 -0
- package/lib/server/modules/form/types.d.ts +13 -0
- package/lib/server/modules/form/types.js +9 -0
- package/lib/server/modules/index.d.ts +3 -0
- package/lib/server/modules/index.js +15 -1
- package/lib/server/modules/order/index.d.ts +21 -0
- package/lib/server/modules/order/index.js +344 -35
- package/lib/server/modules/order/types.d.ts +3 -0
- package/lib/server/modules/order/utils/filterOrders.js +18 -0
- package/lib/server/modules/products/index.d.ts +28 -7
- package/lib/server/modules/products/index.js +224 -62
- package/lib/server/modules/products/replication.d.ts +8 -0
- package/lib/server/modules/products/replication.js +30 -0
- package/lib/server/modules/products/types.d.ts +12 -1
- package/lib/server/modules/products/types.js +3 -0
- package/lib/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/lib/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/lib/shared/receipt/small-ticket.d.ts +1 -0
- package/lib/shared/receipt/small-ticket.js +53 -25
- package/lib/shared/receipt/templateVisibility.d.ts +3 -0
- package/lib/shared/receipt/templateVisibility.js +6 -2
- package/lib/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/lib/solution/BaseSales/fulfillmentItemRules.js +259 -0
- package/lib/solution/BaseSales/index.d.ts +22 -6
- package/lib/solution/BaseSales/index.js +347 -59
- package/lib/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/lib/solution/BaseSales/pickupTiming.js +24 -3
- package/lib/solution/BaseSales/types.d.ts +4 -0
- package/lib/solution/BaseSales/types.js +1 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.js +133 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +1 -1
- package/lib/solution/BookingByStep/index.d.ts +19 -3
- package/lib/solution/BookingByStep/index.js +229 -17
- package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/lib/solution/BookingByStep/utils/resources.js +25 -15
- package/lib/solution/BookingTicket/index.d.ts +6 -0
- package/lib/solution/BookingTicket/index.js +40 -5
- package/lib/solution/BookingTicket/types.d.ts +1 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.js +34 -4
- package/lib/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.js +136 -0
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +2 -14
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +17 -34
- package/lib/solution/OrderInvoicePreview/index.js +1 -0
- package/lib/solution/Sales/index.js +1 -1
- package/lib/solution/ScanOrder/index.d.ts +2 -0
- package/lib/solution/ScanOrder/index.js +131 -22
- package/lib/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/lib/solution/ScanOrder/menuAvailability.js +203 -0
- package/lib/solution/ScanOrder/types.d.ts +3 -0
- package/lib/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/lib/solution/UnifiedBookingSales/index.js +717 -144
- package/lib/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/lib/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/lib/utils/pos-receipt-auto-print.d.ts +4 -0
- package/lib/utils/pos-receipt-auto-print.js +13 -0
- package/package.json +1 -1
|
@@ -190,6 +190,10 @@ export function normalizeVirtualCurrencySnapshotItem(value) {
|
|
|
190
190
|
if (productId !== undefined) {
|
|
191
191
|
snapshot.product_id = productId;
|
|
192
192
|
}
|
|
193
|
+
var code = normalizeSnapshotScalar(value.code);
|
|
194
|
+
if (code !== undefined) {
|
|
195
|
+
snapshot.code = String(code).trim();
|
|
196
|
+
}
|
|
193
197
|
return snapshot;
|
|
194
198
|
}
|
|
195
199
|
function normalizeVirtualCurrencySnapshotList(value) {
|
|
@@ -221,6 +225,10 @@ export function buildVirtualCurrencySnapshotFromList(value) {
|
|
|
221
225
|
if (productId !== undefined) {
|
|
222
226
|
snapshot.product_id = productId;
|
|
223
227
|
}
|
|
228
|
+
var code = normalizeSnapshotScalar(item.code);
|
|
229
|
+
if (code !== undefined) {
|
|
230
|
+
snapshot.code = String(code).trim();
|
|
231
|
+
}
|
|
224
232
|
result.push(snapshot);
|
|
225
233
|
return result;
|
|
226
234
|
}, []);
|
|
@@ -412,11 +420,44 @@ function getOrderProductDeposit(product, runtimeOrigin) {
|
|
|
412
420
|
num: num
|
|
413
421
|
});
|
|
414
422
|
if (result.result) {
|
|
423
|
+
var _product$metadata, _product$metadata2;
|
|
415
424
|
depositTotal = result.depositTotal;
|
|
416
425
|
protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
|
|
417
426
|
self_deposit_policy_ids: depositData.self_deposit_policy_ids
|
|
418
427
|
})));
|
|
419
428
|
hasDeposit = true;
|
|
429
|
+
|
|
430
|
+
// 主商品金额不包含 markup/product_price 这类独立计价子商品。
|
|
431
|
+
// 以前父规则命中后直接跳过子项,导致“父价 0 + 子票 70 × 10”即使
|
|
432
|
+
// 子票已命中 50% 定金规则,仍算出 0;应累加子项自己的定金规则。
|
|
433
|
+
// 普通加价/减价子项已计入主价,不能重复收取。未拆分主价的旧订单行
|
|
434
|
+
// selling_price 可能包含整个套餐,继续沿用原口径,避免重复计费。
|
|
435
|
+
var hasSeparateMainPrice = ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_attached_bundle_payment_price) != null || ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_selling_price) != null;
|
|
436
|
+
if (hasSeparateMainPrice && Array.isArray(product.product_bundle)) {
|
|
437
|
+
var _iterator3 = _createForOfIteratorHelper(product.product_bundle),
|
|
438
|
+
_step3;
|
|
439
|
+
try {
|
|
440
|
+
for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
|
|
441
|
+
var _ref10, _bundleProduct$bundle, _bundleProduct$num;
|
|
442
|
+
var bundleProduct = _step3.value;
|
|
443
|
+
if (bundleProduct.price_type !== 'markup' || bundleProduct.price_type_ext !== 'product_price') continue;
|
|
444
|
+
var bundleDepositData = bundleProduct.custom_deposit_data;
|
|
445
|
+
var bundleResult = handleOrderProductDeposit({
|
|
446
|
+
depositData: bundleDepositData,
|
|
447
|
+
// payment 是已分摊折扣的子商品单价;子项数量和套餐数量各乘一次。
|
|
448
|
+
total: (_ref10 = (_bundleProduct$bundle = bundleProduct.bundle_payment_price) !== null && _bundleProduct$bundle !== void 0 ? _bundleProduct$bundle : bundleProduct.bundle_selling_price) !== null && _ref10 !== void 0 ? _ref10 : bundleProduct.price,
|
|
449
|
+
num: getSafeOrderProductNum((_bundleProduct$num = bundleProduct.num) !== null && _bundleProduct$num !== void 0 ? _bundleProduct$num : bundleProduct.quantity) * num
|
|
450
|
+
});
|
|
451
|
+
if (!bundleResult.result) continue;
|
|
452
|
+
depositTotal = depositTotal.plus(bundleResult.depositTotal);
|
|
453
|
+
protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds(bundleDepositData)));
|
|
454
|
+
}
|
|
455
|
+
} catch (err) {
|
|
456
|
+
_iterator3.e(err);
|
|
457
|
+
} finally {
|
|
458
|
+
_iterator3.f();
|
|
459
|
+
}
|
|
460
|
+
}
|
|
420
461
|
}
|
|
421
462
|
} else {
|
|
422
463
|
var _depositProduct$produ;
|
|
@@ -479,36 +520,36 @@ export function calculateOrderProductsDeposit() {
|
|
|
479
520
|
var protocolMap = new Map();
|
|
480
521
|
var total = new Decimal(0);
|
|
481
522
|
var hasDeposit = false;
|
|
482
|
-
var
|
|
483
|
-
|
|
523
|
+
var _iterator4 = _createForOfIteratorHelper(products || []),
|
|
524
|
+
_step4;
|
|
484
525
|
try {
|
|
485
|
-
for (
|
|
486
|
-
var _product$
|
|
487
|
-
var product =
|
|
488
|
-
var productUid = (_product$
|
|
526
|
+
for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
|
|
527
|
+
var _product$metadata3, _options$productsByUi;
|
|
528
|
+
var product = _step4.value;
|
|
529
|
+
var productUid = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.unique_identification_number;
|
|
489
530
|
var runtimeOrigin = productUid ? options === null || options === void 0 || (_options$productsByUi = options.productsByUid) === null || _options$productsByUi === void 0 || (_options$productsByUi = _options$productsByUi[productUid]) === null || _options$productsByUi === void 0 ? void 0 : _options$productsByUi.origin : undefined;
|
|
490
531
|
var deposit = getOrderProductDeposit(product, runtimeOrigin);
|
|
491
532
|
product.deposit = deposit;
|
|
492
533
|
if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
|
|
493
534
|
total = total.plus(deposit.total);
|
|
494
|
-
var
|
|
495
|
-
|
|
535
|
+
var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
|
|
536
|
+
_step5;
|
|
496
537
|
try {
|
|
497
|
-
for (
|
|
498
|
-
var protocol =
|
|
538
|
+
for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
|
|
539
|
+
var protocol = _step5.value;
|
|
499
540
|
if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
|
|
500
541
|
}
|
|
501
542
|
} catch (err) {
|
|
502
|
-
|
|
543
|
+
_iterator5.e(err);
|
|
503
544
|
} finally {
|
|
504
|
-
|
|
545
|
+
_iterator5.f();
|
|
505
546
|
}
|
|
506
547
|
hasDeposit = true;
|
|
507
548
|
}
|
|
508
549
|
} catch (err) {
|
|
509
|
-
|
|
550
|
+
_iterator4.e(err);
|
|
510
551
|
} finally {
|
|
511
|
-
|
|
552
|
+
_iterator4.f();
|
|
512
553
|
}
|
|
513
554
|
var roundedTotal = total.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
|
|
514
555
|
var protocols = _toConsumableArray(protocolMap.values());
|
|
@@ -544,12 +585,12 @@ export function isMarkdownBundle(bundle) {
|
|
|
544
585
|
* - markup(加价)/原价子商品:维持 `+(bundle_selling_price ?? price)`,行为不变。
|
|
545
586
|
*/
|
|
546
587
|
export function getBundleSignedUnit(bundle, options) {
|
|
547
|
-
var _options$useOriginal,
|
|
588
|
+
var _options$useOriginal, _ref17, _bundle$original_pric2, _bundle$bundle_sellin;
|
|
548
589
|
if (!bundle || _typeof(bundle) !== 'object') return new Decimal(0);
|
|
549
590
|
var useOriginal = (_options$useOriginal = options === null || options === void 0 ? void 0 : options.useOriginal) !== null && _options$useOriginal !== void 0 ? _options$useOriginal : false;
|
|
550
591
|
if (isMarkdownBundle(bundle)) {
|
|
551
|
-
var
|
|
552
|
-
var catalog = useOriginal ? (
|
|
592
|
+
var _ref11, _ref12, _ref13, _bundle$original_pric, _ref14, _ref15, _ref16, _bundle$custom_price;
|
|
593
|
+
var catalog = useOriginal ? (_ref11 = (_ref12 = (_ref13 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref13 !== void 0 ? _ref13 : bundle.custom_price) !== null && _ref12 !== void 0 ? _ref12 : bundle.base_price) !== null && _ref11 !== void 0 ? _ref11 : bundle.price : (_ref14 = (_ref15 = (_ref16 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref16 !== void 0 ? _ref16 : bundle.original_price) !== null && _ref15 !== void 0 ? _ref15 : bundle.base_price) !== null && _ref14 !== void 0 ? _ref14 : bundle.price;
|
|
553
594
|
if (catalog !== undefined && catalog !== null && catalog !== '') {
|
|
554
595
|
var raw = new Decimal(Number(catalog) || 0);
|
|
555
596
|
// 负值表示价格已是「带符号净额」(如 cart/changePrice 产出的 -3.7),直接取用不再扣 option,
|
|
@@ -560,7 +601,7 @@ export function getBundleSignedUnit(bundle, options) {
|
|
|
560
601
|
// 仅剩净额(无毛价)兜底:直接取负,不再扣 option
|
|
561
602
|
return new Decimal(Number(bundle.bundle_selling_price) || 0).abs().negated();
|
|
562
603
|
}
|
|
563
|
-
var rawPrice = useOriginal ? (
|
|
604
|
+
var rawPrice = useOriginal ? (_ref17 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref17 !== void 0 ? _ref17 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
|
|
564
605
|
return new Decimal(Number(rawPrice) || 0);
|
|
565
606
|
}
|
|
566
607
|
|
|
@@ -589,7 +630,9 @@ export function getBundleSellingMagnitude(bundle) {
|
|
|
589
630
|
*
|
|
590
631
|
* Rules 钩子契约(hook_adapt 方案,Rules 内部保持不变):
|
|
591
632
|
* - `getProduct.price` / `getProduct.original_price` 回传 **source-level 主价**
|
|
592
|
-
* (`metadata.source_product_price
|
|
633
|
+
* (`metadata.source_product_price`);买赠行的 `price` 为 0,`original_price` 仍保留 source。
|
|
634
|
+
* 赠品基础价已被赠送优惠抵扣,只有收费 option / bundle 继续按卡券规则计算。
|
|
635
|
+
* Rules 内部 `getProductTotalPrice` /
|
|
593
636
|
* `getProductOriginTotalPrice` 会自行叠加 option + bundle,喂 source 可避免 option 双加。
|
|
594
637
|
* - `getProduct.total` = `selling_price × num`(行 composite × num),与 Rules 内部产出的
|
|
595
638
|
* total(source + option + bundle)对齐。
|
|
@@ -684,19 +727,19 @@ function ensureSubmitDiscountIdentity(discount) {
|
|
|
684
727
|
}
|
|
685
728
|
function collectSubmitProductDiscountList(product) {
|
|
686
729
|
var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
|
|
687
|
-
var
|
|
688
|
-
|
|
730
|
+
var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
|
|
731
|
+
_step6;
|
|
689
732
|
try {
|
|
690
|
-
for (
|
|
691
|
-
var bundle =
|
|
733
|
+
for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
|
|
734
|
+
var bundle = _step6.value;
|
|
692
735
|
if (!bundle || _typeof(bundle) !== 'object') continue;
|
|
693
736
|
var bundleMapId = resolveSubmitBundleMapId(bundle);
|
|
694
737
|
var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
|
|
695
|
-
var
|
|
696
|
-
|
|
738
|
+
var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
|
|
739
|
+
_step7;
|
|
697
740
|
try {
|
|
698
|
-
for (
|
|
699
|
-
var discount =
|
|
741
|
+
for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
|
|
742
|
+
var discount = _step7.value;
|
|
700
743
|
if (!discount || _typeof(discount) !== 'object') continue;
|
|
701
744
|
var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
|
|
702
745
|
var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
|
|
@@ -707,15 +750,15 @@ function collectSubmitProductDiscountList(product) {
|
|
|
707
750
|
} : {}));
|
|
708
751
|
}
|
|
709
752
|
} catch (err) {
|
|
710
|
-
|
|
753
|
+
_iterator7.e(err);
|
|
711
754
|
} finally {
|
|
712
|
-
|
|
755
|
+
_iterator7.f();
|
|
713
756
|
}
|
|
714
757
|
}
|
|
715
758
|
} catch (err) {
|
|
716
|
-
|
|
759
|
+
_iterator6.e(err);
|
|
717
760
|
} finally {
|
|
718
|
-
|
|
761
|
+
_iterator6.f();
|
|
719
762
|
}
|
|
720
763
|
return normalizeOrderProductDiscountList(submitDiscountList.map(ensureSubmitDiscountIdentity));
|
|
721
764
|
}
|
|
@@ -792,26 +835,26 @@ export function resolveEffectivePerUnitDiscount(product) {
|
|
|
792
835
|
}
|
|
793
836
|
export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
794
837
|
var getProductStartDate = function getProductStartDate(product) {
|
|
795
|
-
var
|
|
796
|
-
var productUid = String((
|
|
797
|
-
var bookingUid = String((
|
|
838
|
+
var _ref18, _product$metadata$uni, _product$metadata4, _ref19, _product$booking_uid, _product$metadata5, _product$metadata6, _product$metadata7, _product$metadata8;
|
|
839
|
+
var productUid = String((_ref18 = (_product$metadata$uni = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number) !== null && _ref18 !== void 0 ? _ref18 : '');
|
|
840
|
+
var bookingUid = String((_ref19 = (_product$booking_uid = product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid) !== null && _ref19 !== void 0 ? _ref19 : '');
|
|
798
841
|
// 每次读取当前 bookings,覆盖改期、订单回显以及直接调用 Rules 的选券入口。
|
|
799
842
|
var bookings = (getBookings === null || getBookings === void 0 ? void 0 : getBookings()) || [];
|
|
800
843
|
var booking = bookings.find(function (item) {
|
|
801
|
-
var
|
|
802
|
-
return productUid && String((
|
|
844
|
+
var _ref20, _item$product_uid, _item$metadata3;
|
|
845
|
+
return productUid && String((_ref20 = (_item$product_uid = item === null || item === void 0 ? void 0 : item.product_uid) !== null && _item$product_uid !== void 0 ? _item$product_uid : item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.product_uid) !== null && _ref20 !== void 0 ? _ref20 : '') === productUid;
|
|
803
846
|
}) || bookings.find(function (item) {
|
|
804
|
-
var
|
|
805
|
-
return bookingUid && String((
|
|
847
|
+
var _ref21, _item$metadata$unique, _item$metadata4;
|
|
848
|
+
return bookingUid && String((_ref21 = (_item$metadata$unique = item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) !== null && _item$metadata$unique !== void 0 ? _item$metadata$unique : item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _ref21 !== void 0 ? _ref21 : '') === bookingUid;
|
|
806
849
|
});
|
|
807
850
|
if (booking) {
|
|
808
851
|
// 严格解析并保留 Invalid Date,让公共时间校验拒绝缺失/非法时间,避免回退到当前时间。
|
|
809
852
|
return dayjs("".concat(booking.start_date, " ").concat(booking.start_time), ['YYYY-MM-DD HH:mm', 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD H:mm', 'YYYY-MM-DD H:mm:ss'], true);
|
|
810
853
|
}
|
|
811
|
-
if (getBookings && (bookingUid || product.booking_id || (_product$
|
|
854
|
+
if (getBookings && (bookingUid || product.booking_id || (_product$metadata6 = product.metadata) !== null && _product$metadata6 !== void 0 && _product$metadata6.booking_id)) {
|
|
812
855
|
return dayjs('');
|
|
813
856
|
}
|
|
814
|
-
var legacyStartDate = ((_product$
|
|
857
|
+
var legacyStartDate = ((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.start_date) || ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.startDate);
|
|
815
858
|
return legacyStartDate ? dayjs(legacyStartDate) : undefined;
|
|
816
859
|
};
|
|
817
860
|
var toUnitPriceString = function toUnitPriceString(totalLike, num) {
|
|
@@ -828,8 +871,8 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
828
871
|
}, new Decimal(0));
|
|
829
872
|
};
|
|
830
873
|
var getBundleIdentity = function getBundleIdentity(bundle) {
|
|
831
|
-
var
|
|
832
|
-
return [(
|
|
874
|
+
var _ref22, _bundle$bundle_id, _ref23, _ref24, _bundle$bundle_produc, _ref25, _ref26, _bundle$bundle_varian, _ref27, _bundle$bundle_group_;
|
|
875
|
+
return [(_ref22 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref22 !== void 0 ? _ref22 : '', (_ref23 = (_ref24 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : '', (_ref25 = (_ref26 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref26 !== void 0 ? _ref26 : bundle.product_variant_id) !== null && _ref25 !== void 0 ? _ref25 : 0, (_ref27 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref27 !== void 0 ? _ref27 : ''].join('|');
|
|
833
876
|
};
|
|
834
877
|
var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
|
|
835
878
|
if (!Array.isArray(rulesBundle)) return rulesBundle;
|
|
@@ -839,7 +882,7 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
839
882
|
currentByIdentity.set(getBundleIdentity(bundle), bundle);
|
|
840
883
|
});
|
|
841
884
|
return rulesBundle.map(function (bundle) {
|
|
842
|
-
var _bundle$price_type_ex2,
|
|
885
|
+
var _bundle$price_type_ex2, _ref28, _ref29, _current$price, _ref30, _ref31, _ref32, _current$original_pri;
|
|
843
886
|
if (!bundle || _typeof(bundle) !== 'object') return bundle;
|
|
844
887
|
var current = currentByIdentity.get(getBundleIdentity(bundle));
|
|
845
888
|
if (!current) return bundle;
|
|
@@ -848,8 +891,8 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
848
891
|
} : {});
|
|
849
892
|
var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
|
|
850
893
|
if (!isProductPriceBundle) return bundleWithDisplayFields;
|
|
851
|
-
var sourcePrice = (
|
|
852
|
-
var originalPrice = (
|
|
894
|
+
var sourcePrice = (_ref28 = (_ref29 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref29 !== void 0 ? _ref29 : current.original_price) !== null && _ref28 !== void 0 ? _ref28 : current.bundle_selling_price;
|
|
895
|
+
var originalPrice = (_ref30 = (_ref31 = (_ref32 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref32 !== void 0 ? _ref32 : current.price) !== null && _ref31 !== void 0 ? _ref31 : current.custom_price) !== null && _ref30 !== void 0 ? _ref30 : sourcePrice;
|
|
853
896
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
|
|
854
897
|
price: sourcePrice
|
|
855
898
|
} : {}), originalPrice !== undefined ? {
|
|
@@ -861,7 +904,7 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
861
904
|
};
|
|
862
905
|
return {
|
|
863
906
|
getProduct: function getProduct(product) {
|
|
864
|
-
var _product$
|
|
907
|
+
var _product$metadata9, _product$metadata10, _product$metadata11, _metadataAny$_promoti;
|
|
865
908
|
// source_product_price 是权威源;兜底链:source → mainSelling − options(反推)→ 行 selling_price
|
|
866
909
|
var metadataAny = product.metadata || {};
|
|
867
910
|
var productOptions = getProductSkuOptions(product);
|
|
@@ -890,10 +933,11 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
890
933
|
// 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
|
|
891
934
|
// 不透明 identity 契约下,normalizeOrderProduct / hydrate 已保证唯一值存在;
|
|
892
935
|
// 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
|
|
893
|
-
_id: (_product$
|
|
936
|
+
_id: (_product$metadata9 = product.metadata) !== null && _product$metadata9 !== void 0 && _product$metadata9.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
|
|
894
937
|
// Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option,
|
|
895
938
|
// 所以这里必须喂 source-level(不含 option、不含 bundle、不含折扣)单价,避免双加 option。
|
|
896
|
-
|
|
939
|
+
// 赠品基础价不再参与卡券;source 元数据保留原价,供后续与赠送优惠相抵。
|
|
940
|
+
price: metadataAny._giftInfo ? '0.00' : sourcePrice,
|
|
897
941
|
// total / origin_total 使用 composite × num,跟 Rules 内部产出的 total 对齐(含 option + bundle)。
|
|
898
942
|
total: new Decimal(product.selling_price || 0).times(product.num || 1).toNumber(),
|
|
899
943
|
origin_total: new Decimal(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
|
|
@@ -908,12 +952,12 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
908
952
|
price: option.add_price
|
|
909
953
|
});
|
|
910
954
|
}),
|
|
911
|
-
booking_id: ((_product$
|
|
955
|
+
booking_id: ((_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.booking_id) || null,
|
|
912
956
|
isClient: false,
|
|
913
957
|
// 勿写死 false:否则 Rules 不会走 total≠origin_total 的手动价推断,
|
|
914
958
|
// 无券时会把 bundle 价还原成 original_price(手动改价套餐会从 20 回到 30)。
|
|
915
959
|
isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
|
|
916
|
-
holder_id: hasProductBooking(product) || !getHolderRelations ? (_product$
|
|
960
|
+
holder_id: hasProductBooking(product) || !getHolderRelations ? (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.holder_id : getProductHolderRelations({
|
|
917
961
|
holder_relations: getHolderRelations()
|
|
918
962
|
}, product).filter(function (relation) {
|
|
919
963
|
return relation.holder_type === 'form';
|
|
@@ -927,10 +971,10 @@ export function createDefaultOrderRulesHooks(getBookings, getHolderRelations) {
|
|
|
927
971
|
};
|
|
928
972
|
},
|
|
929
973
|
setProduct: function setProduct(product, values) {
|
|
930
|
-
var
|
|
931
|
-
var nextNum = Number((
|
|
974
|
+
var _ref33, _values$quantity, _ref34, _metadataAny$source_p, _values$discount_list, _product$product_sku, _values$quantity2;
|
|
975
|
+
var nextNum = Number((_ref33 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref33 !== void 0 ? _ref33 : 1) || 1;
|
|
932
976
|
var metadataAny = product.metadata || {};
|
|
933
|
-
var existedSource = (
|
|
977
|
+
var existedSource = (_ref34 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref34 !== void 0 ? _ref34 : '0';
|
|
934
978
|
var nextOptions = getProductSkuOptions(product);
|
|
935
979
|
var optionSum = sumOptionUnitPrice(nextOptions);
|
|
936
980
|
var nextDiscountList = (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list;
|
|
@@ -1094,6 +1138,7 @@ function normalizeSubmitPlatform(platform) {
|
|
|
1094
1138
|
var lower = value.toLowerCase();
|
|
1095
1139
|
if (lower === 'pc') return 'PC';
|
|
1096
1140
|
if (lower === 'h5') return 'H5';
|
|
1141
|
+
if (lower === 'webpos') return 'pos';
|
|
1097
1142
|
return value;
|
|
1098
1143
|
}
|
|
1099
1144
|
function normalizeSubmitProductionCode(value) {
|
|
@@ -1107,10 +1152,10 @@ function formatSubmitOptionItems(options) {
|
|
|
1107
1152
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1108
1153
|
if (!Array.isArray(options)) return [];
|
|
1109
1154
|
return options.map(function (d) {
|
|
1110
|
-
var _d$add_price;
|
|
1155
|
+
var _ref35, _d$option_group_item_, _d$add_price;
|
|
1111
1156
|
var option = _objectSpread(_objectSpread({}, d && _typeof(d) === 'object' ? d : {}), {}, {
|
|
1112
1157
|
num: d === null || d === void 0 ? void 0 : d.num,
|
|
1113
|
-
option_group_item_id: d === null || d === void 0 ? void 0 : d.option_group_item_id,
|
|
1158
|
+
option_group_item_id: (_ref35 = (_d$option_group_item_ = d === null || d === void 0 ? void 0 : d.option_group_item_id) !== null && _d$option_group_item_ !== void 0 ? _d$option_group_item_ : d === null || d === void 0 ? void 0 : d.product_option_item_id) !== null && _ref35 !== void 0 ? _ref35 : d === null || d === void 0 ? void 0 : d.id,
|
|
1114
1159
|
option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
|
|
1115
1160
|
});
|
|
1116
1161
|
var productionCode = normalizeSubmitProductionCode(d === null || d === void 0 ? void 0 : d.production_code);
|
|
@@ -1143,7 +1188,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1143
1188
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1144
1189
|
if (!Array.isArray(bundle)) return [];
|
|
1145
1190
|
return bundle.map(function (b) {
|
|
1146
|
-
var
|
|
1191
|
+
var _ref36, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref37, _rawBundle$price_type, _ref38, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
|
|
1147
1192
|
var rawBundle = b && _typeof(b) === 'object' ? b : {};
|
|
1148
1193
|
var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
|
|
1149
1194
|
var _customProductBundleMapId = existedMetadata.custom_product_bundle_map_id,
|
|
@@ -1154,7 +1199,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1154
1199
|
var sellingPrice = formatOptions.virtualSettlementMode ? '0.00' : getBundleSellingMagnitude(rawBundle).toFixed(2);
|
|
1155
1200
|
// payment 价由整单折扣均摊层产出;缺省(无折扣)时与 selling 净额同义。
|
|
1156
1201
|
var paymentPrice = formatOptions.virtualSettlementMode ? '0.00' : rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
|
|
1157
|
-
var priceValue = formatOptions.virtualSettlementMode ? 0 : (
|
|
1202
|
+
var priceValue = formatOptions.virtualSettlementMode ? 0 : (_ref36 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref36 !== void 0 ? _ref36 : rawBundle.bundle_selling_price;
|
|
1158
1203
|
var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
|
|
1159
1204
|
var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
|
|
1160
1205
|
var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
|
|
@@ -1173,8 +1218,8 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1173
1218
|
extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
|
|
1174
1219
|
extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
|
|
1175
1220
|
price: priceValue,
|
|
1176
|
-
price_type: (
|
|
1177
|
-
price_type_ext: (
|
|
1221
|
+
price_type: (_ref37 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref37 !== void 0 ? _ref37 : '',
|
|
1222
|
+
price_type_ext: (_ref38 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref38 !== void 0 ? _ref38 : '',
|
|
1178
1223
|
bundle_selling_price: sellingPrice,
|
|
1179
1224
|
bundle_payment_price: paymentPrice,
|
|
1180
1225
|
option: formatSubmitOptionItems(rawBundle.option, formatOptions),
|
|
@@ -1210,11 +1255,11 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1210
1255
|
* 法币仅做字段/metadata 裁剪;虚拟币在出站前再次执行零加价与固定单价断言。
|
|
1211
1256
|
*/
|
|
1212
1257
|
function normalizeSubmitProduct(product) {
|
|
1213
|
-
var
|
|
1258
|
+
var _ref40, _submitProduct$bundle, _rawMetadata$pricing_, _rawMetadata$product_, _rawMetadata$selected, _rawMetadata$selected2, _submitProduct$produc, _submitProduct$paymen;
|
|
1214
1259
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1215
|
-
var
|
|
1216
|
-
_runtimeUid =
|
|
1217
|
-
submitProduct = _objectWithoutProperties(
|
|
1260
|
+
var _ref39 = product,
|
|
1261
|
+
_runtimeUid = _ref39.unique_identification_number,
|
|
1262
|
+
submitProduct = _objectWithoutProperties(_ref39, _excluded2);
|
|
1218
1263
|
var num = submitProduct.num,
|
|
1219
1264
|
_productExtend = submitProduct._extend,
|
|
1220
1265
|
_productSurchargeFee = submitProduct.surcharge_fee,
|
|
@@ -1232,7 +1277,7 @@ function normalizeSubmitProduct(product) {
|
|
|
1232
1277
|
// 兼容历史 BigSale 编辑链路:bundle_edit 曾被写入 metadata,
|
|
1233
1278
|
// 出站时需提升到商品顶层;套餐未编辑时也必须显式提交 0。
|
|
1234
1279
|
var hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
|
|
1235
|
-
var bundleEdit = (
|
|
1280
|
+
var bundleEdit = (_ref40 = (_submitProduct$bundle = submitProduct.bundle_edit) !== null && _submitProduct$bundle !== void 0 ? _submitProduct$bundle : rawMetadata.bundle_edit) !== null && _ref40 !== void 0 ? _ref40 : hasProductBundle ? 0 : undefined;
|
|
1236
1281
|
var cleanMetadata = {};
|
|
1237
1282
|
if (rawMetadata.unique_identification_number) {
|
|
1238
1283
|
cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
|
|
@@ -1244,6 +1289,17 @@ function normalizeSubmitProduct(product) {
|
|
|
1244
1289
|
cleanMetadata[key] = rawMetadata[key];
|
|
1245
1290
|
}
|
|
1246
1291
|
}
|
|
1292
|
+
// Persist only an applied pricing snapshot, so reopening a saved order can
|
|
1293
|
+
// compare it with the latest catalog without reinterpreting legacy duration.
|
|
1294
|
+
var pricingMethod = (_rawMetadata$pricing_ = rawMetadata.pricing_method) === null || _rawMetadata$pricing_ === void 0 ? void 0 : _rawMetadata$pricing_.type;
|
|
1295
|
+
if (pricingMethod === 'duration_based' || pricingMethod === 'fixed_price') {
|
|
1296
|
+
cleanMetadata.pricing_method = {
|
|
1297
|
+
type: pricingMethod
|
|
1298
|
+
};
|
|
1299
|
+
if (pricingMethod === 'duration_based' && rawMetadata.duration) {
|
|
1300
|
+
cleanMetadata.duration = _objectSpread({}, rawMetadata.duration);
|
|
1301
|
+
}
|
|
1302
|
+
}
|
|
1247
1303
|
cleanMetadata.product_discount_difference = (_rawMetadata$product_ = rawMetadata.product_discount_difference) !== null && _rawMetadata$product_ !== void 0 ? _rawMetadata$product_ : '';
|
|
1248
1304
|
if (rawMetadata.price_breakdown) {
|
|
1249
1305
|
cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
|
|
@@ -1309,19 +1365,19 @@ export function redeemEventKey(value) {
|
|
|
1309
1365
|
export function restoreRedeemVoucherTimes(order, vouchers) {
|
|
1310
1366
|
if (!Array.isArray(vouchers) || !vouchers.length) return vouchers;
|
|
1311
1367
|
var markedBookings = new Map();
|
|
1312
|
-
var
|
|
1313
|
-
|
|
1368
|
+
var _iterator8 = _createForOfIteratorHelper(order.bookings || []),
|
|
1369
|
+
_step8;
|
|
1314
1370
|
try {
|
|
1315
|
-
for (
|
|
1371
|
+
for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
|
|
1316
1372
|
var _booking$metadata;
|
|
1317
|
-
var booking =
|
|
1373
|
+
var booking = _step8.value;
|
|
1318
1374
|
var event = redeemEventKey(booking === null || booking === void 0 ? void 0 : booking.schedule_event_id);
|
|
1319
1375
|
if (event && Number((_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.is_change_by_redeem) === 1) markedBookings.set(event, booking);
|
|
1320
1376
|
}
|
|
1321
1377
|
} catch (err) {
|
|
1322
|
-
|
|
1378
|
+
_iterator8.e(err);
|
|
1323
1379
|
} finally {
|
|
1324
|
-
|
|
1380
|
+
_iterator8.f();
|
|
1325
1381
|
}
|
|
1326
1382
|
if (!markedBookings.size) return vouchers;
|
|
1327
1383
|
var restored = vouchers;
|
|
@@ -1337,10 +1393,10 @@ export function restoreRedeemVoucherTimes(order, vouchers) {
|
|
|
1337
1393
|
}), booking.end_date && {
|
|
1338
1394
|
expire_date: booking.end_date
|
|
1339
1395
|
});
|
|
1340
|
-
var timeChanged = Object.entries(times).some(function (
|
|
1341
|
-
var
|
|
1342
|
-
key =
|
|
1343
|
-
value =
|
|
1396
|
+
var timeChanged = Object.entries(times).some(function (_ref41) {
|
|
1397
|
+
var _ref42 = _slicedToArray(_ref41, 2),
|
|
1398
|
+
key = _ref42[0],
|
|
1399
|
+
value = _ref42[1];
|
|
1344
1400
|
return voucher[key] !== value;
|
|
1345
1401
|
});
|
|
1346
1402
|
if (!timeChanged) return;
|
|
@@ -1363,19 +1419,19 @@ export function normalizeBookingSubType(booking) {
|
|
|
1363
1419
|
export function normalizeSubmitBooking(booking) {
|
|
1364
1420
|
var rawMetadata = booking.metadata || {};
|
|
1365
1421
|
var cleanMetadata = {};
|
|
1366
|
-
var
|
|
1367
|
-
|
|
1422
|
+
var _iterator9 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
|
|
1423
|
+
_step9;
|
|
1368
1424
|
try {
|
|
1369
|
-
for (
|
|
1370
|
-
var key =
|
|
1425
|
+
for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
|
|
1426
|
+
var key = _step9.value;
|
|
1371
1427
|
if (rawMetadata[key] !== undefined) {
|
|
1372
1428
|
cleanMetadata[key] = rawMetadata[key];
|
|
1373
1429
|
}
|
|
1374
1430
|
}
|
|
1375
1431
|
} catch (err) {
|
|
1376
|
-
|
|
1432
|
+
_iterator9.e(err);
|
|
1377
1433
|
} finally {
|
|
1378
|
-
|
|
1434
|
+
_iterator9.f();
|
|
1379
1435
|
}
|
|
1380
1436
|
if (cleanMetadata.holder_id === undefined && !isFulfillmentTimingBooking(booking)) {
|
|
1381
1437
|
cleanMetadata.holder_id = null;
|
|
@@ -1397,7 +1453,7 @@ export function normalizeSubmitBooking(booking) {
|
|
|
1397
1453
|
});
|
|
1398
1454
|
}
|
|
1399
1455
|
var DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
|
|
1400
|
-
function resolveTableOccupancyDuration(tempOrder) {
|
|
1456
|
+
export function resolveTableOccupancyDuration(tempOrder) {
|
|
1401
1457
|
var _metadata$table_confi, _metadata$tableConfig, _metadata$resource_co, _metadata$resourceCon;
|
|
1402
1458
|
var metadata = tempOrder.metadata || {};
|
|
1403
1459
|
var candidates = [metadata.table_occupancy_duration, metadata.booking_duration, metadata.table_duration, metadata.duration, (_metadata$table_confi = metadata.table_config) === null || _metadata$table_confi === void 0 ? void 0 : _metadata$table_confi.occupancy_duration, (_metadata$tableConfig = metadata.tableConfig) === null || _metadata$tableConfig === void 0 ? void 0 : _metadata$tableConfig.occupancy_duration, (_metadata$resource_co = metadata.resource_config) === null || _metadata$resource_co === void 0 ? void 0 : _metadata$resource_co.occupancy_duration, (_metadata$resourceCon = metadata.resourceConfig) === null || _metadata$resourceCon === void 0 ? void 0 : _metadata$resourceCon.occupancy_duration];
|
|
@@ -1525,7 +1581,7 @@ export function resolveSubmitOrderType(params) {
|
|
|
1525
1581
|
return 'virtual';
|
|
1526
1582
|
}
|
|
1527
1583
|
export function buildSubmitPayload(params) {
|
|
1528
|
-
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_,
|
|
1584
|
+
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref44, _tempOrder$is_price_i, _tempOrder$is_deposit, _tempOrder$_extend, _enhancedPayload$summ;
|
|
1529
1585
|
var tempOrder = params.tempOrder,
|
|
1530
1586
|
cacheId = params.cacheId,
|
|
1531
1587
|
_params$now = params.now,
|
|
@@ -1540,29 +1596,29 @@ export function buildSubmitPayload(params) {
|
|
|
1540
1596
|
var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
|
|
1541
1597
|
var bookingUuid = createUuidV4();
|
|
1542
1598
|
var virtualSettlementMode = ((_tempOrder$metadata2 = tempOrder.metadata) === null || _tempOrder$metadata2 === void 0 || (_tempOrder$metadata2 = _tempOrder$metadata2.currency_settlement_config) === null || _tempOrder$metadata2 === void 0 ? void 0 : _tempOrder$metadata2.settlement_type) === 'virtual_currency';
|
|
1543
|
-
var
|
|
1544
|
-
_extend =
|
|
1545
|
-
_relationId =
|
|
1546
|
-
_tableFormId =
|
|
1547
|
-
_resourceId =
|
|
1548
|
-
_summary =
|
|
1549
|
-
_lastOrderInfo =
|
|
1550
|
-
_paidAmount =
|
|
1551
|
-
_shopId =
|
|
1552
|
-
_shopNote =
|
|
1553
|
-
_shopServiceType =
|
|
1554
|
-
_startTime =
|
|
1555
|
-
_customer =
|
|
1556
|
-
_discountList =
|
|
1557
|
-
_orderMetaList =
|
|
1558
|
-
_rootTaxFee =
|
|
1559
|
-
_totalAmount =
|
|
1560
|
-
_totalRefundAmount =
|
|
1561
|
-
_createDate =
|
|
1562
|
-
_holderId =
|
|
1563
|
-
_paymentStatus =
|
|
1564
|
-
_notes =
|
|
1565
|
-
tempOrderRest = _objectWithoutProperties(
|
|
1599
|
+
var _ref43 = tempOrder,
|
|
1600
|
+
_extend = _ref43._extend,
|
|
1601
|
+
_relationId = _ref43.relation_id,
|
|
1602
|
+
_tableFormId = _ref43.table_form_id,
|
|
1603
|
+
_resourceId = _ref43.resource_id,
|
|
1604
|
+
_summary = _ref43.summary,
|
|
1605
|
+
_lastOrderInfo = _ref43.lastOrderInfo,
|
|
1606
|
+
_paidAmount = _ref43.paid_amount,
|
|
1607
|
+
_shopId = _ref43.shop_id,
|
|
1608
|
+
_shopNote = _ref43.shop_note,
|
|
1609
|
+
_shopServiceType = _ref43.shop_service_type,
|
|
1610
|
+
_startTime = _ref43.start_time,
|
|
1611
|
+
_customer = _ref43.customer,
|
|
1612
|
+
_discountList = _ref43.discount_list,
|
|
1613
|
+
_orderMetaList = _ref43.order_meta_list,
|
|
1614
|
+
_rootTaxFee = _ref43.tax_fee,
|
|
1615
|
+
_totalAmount = _ref43.total_amount,
|
|
1616
|
+
_totalRefundAmount = _ref43.total_refund_amount,
|
|
1617
|
+
_createDate = _ref43.create_date,
|
|
1618
|
+
_holderId = _ref43.holder_id,
|
|
1619
|
+
_paymentStatus = _ref43.payment_status,
|
|
1620
|
+
_notes = _ref43.notes,
|
|
1621
|
+
tempOrderRest = _objectWithoutProperties(_ref43, _excluded4);
|
|
1566
1622
|
var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code;
|
|
1567
1623
|
var normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
|
|
1568
1624
|
var submitType = resolveSubmitOrderType({
|
|
@@ -1589,7 +1645,7 @@ export function buildSubmitPayload(params) {
|
|
|
1589
1645
|
type: submitType,
|
|
1590
1646
|
business_code: resolvedBusinessCode,
|
|
1591
1647
|
sales_channel: tempOrder.sales_channel || 'my_pisel',
|
|
1592
|
-
order_sales_channel: (
|
|
1648
|
+
order_sales_channel: (_ref44 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref44 !== void 0 ? _ref44 : 'online_store',
|
|
1593
1649
|
status: tempOrder.status || 'normal'
|
|
1594
1650
|
}, params.includePaymentStatus !== false ? {
|
|
1595
1651
|
payment_status: tempOrder.payment_status || 'payment_processing'
|
|
@@ -1617,13 +1673,13 @@ export function buildSubmitPayload(params) {
|
|
|
1617
1673
|
// holder: tempOrder.holder || null,
|
|
1618
1674
|
summary: summary || tempOrder.summary || createEmptySummary(),
|
|
1619
1675
|
metadata: function () {
|
|
1620
|
-
var
|
|
1621
|
-
_collectPax =
|
|
1622
|
-
_tableOccupancyDuration =
|
|
1623
|
-
_cartSettlementKey =
|
|
1624
|
-
_cartSettlementSnapshot =
|
|
1625
|
-
_legalCurrencySnapshot =
|
|
1626
|
-
rest = _objectWithoutProperties(
|
|
1676
|
+
var _ref45 = tempOrder.metadata || {},
|
|
1677
|
+
_collectPax = _ref45.collect_pax,
|
|
1678
|
+
_tableOccupancyDuration = _ref45.table_occupancy_duration,
|
|
1679
|
+
_cartSettlementKey = _ref45.cart_settlement_key,
|
|
1680
|
+
_cartSettlementSnapshot = _ref45.cart_settlement_snapshot,
|
|
1681
|
+
_legalCurrencySnapshot = _ref45.legal_currency_snapshot,
|
|
1682
|
+
rest = _objectWithoutProperties(_ref45, _excluded5);
|
|
1627
1683
|
return _objectSpread({}, rest);
|
|
1628
1684
|
}()
|
|
1629
1685
|
}, (_tempOrder$_extend = tempOrder._extend) !== null && _tempOrder$_extend !== void 0 && (_tempOrder$_extend = _tempOrder$_extend.salesNotesState) !== null && _tempOrder$_extend !== void 0 && _tempOrder$_extend.dirty ? {
|
|
@@ -1781,25 +1837,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
|
|
|
1781
1837
|
changed = true;
|
|
1782
1838
|
}
|
|
1783
1839
|
};
|
|
1784
|
-
var
|
|
1785
|
-
|
|
1840
|
+
var _iterator10 = _createForOfIteratorHelper(tempOrder.products || []),
|
|
1841
|
+
_step10;
|
|
1786
1842
|
try {
|
|
1787
|
-
for (
|
|
1788
|
-
var product =
|
|
1843
|
+
for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
|
|
1844
|
+
var product = _step10.value;
|
|
1789
1845
|
if (product.metadata && _typeof(product.metadata) === 'object') {
|
|
1790
1846
|
clearHolder(product.metadata);
|
|
1791
1847
|
}
|
|
1792
1848
|
}
|
|
1793
1849
|
} catch (err) {
|
|
1794
|
-
|
|
1850
|
+
_iterator10.e(err);
|
|
1795
1851
|
} finally {
|
|
1796
|
-
|
|
1852
|
+
_iterator10.f();
|
|
1797
1853
|
}
|
|
1798
|
-
var
|
|
1799
|
-
|
|
1854
|
+
var _iterator11 = _createForOfIteratorHelper(tempOrder.bookings || []),
|
|
1855
|
+
_step11;
|
|
1800
1856
|
try {
|
|
1801
|
-
for (
|
|
1802
|
-
var booking =
|
|
1857
|
+
for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
|
|
1858
|
+
var booking = _step11.value;
|
|
1803
1859
|
var bookingRecord = booking;
|
|
1804
1860
|
if (booking.metadata && _typeof(booking.metadata) === 'object') {
|
|
1805
1861
|
resetHolderField(booking.metadata);
|
|
@@ -1810,9 +1866,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
|
|
|
1810
1866
|
}
|
|
1811
1867
|
}
|
|
1812
1868
|
} catch (err) {
|
|
1813
|
-
|
|
1869
|
+
_iterator11.e(err);
|
|
1814
1870
|
} finally {
|
|
1815
|
-
|
|
1871
|
+
_iterator11.f();
|
|
1816
1872
|
}
|
|
1817
1873
|
var productsByUid = (_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.productsByUid;
|
|
1818
1874
|
if (productsByUid && _typeof(productsByUid) === 'object') {
|
|
@@ -1840,9 +1896,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
|
|
|
1840
1896
|
* getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
|
|
1841
1897
|
*/
|
|
1842
1898
|
export function getOrderProductLineUid(product) {
|
|
1843
|
-
var _product$metadata$uni2, _product$
|
|
1899
|
+
var _product$metadata$uni2, _product$metadata12;
|
|
1844
1900
|
if (!product || _typeof(product) !== 'object') return null;
|
|
1845
|
-
var uid = (_product$metadata$uni2 = (_product$
|
|
1901
|
+
var uid = (_product$metadata$uni2 = (_product$metadata12 = product.metadata) === null || _product$metadata12 === void 0 ? void 0 : _product$metadata12.unique_identification_number) !== null && _product$metadata$uni2 !== void 0 ? _product$metadata$uni2 : product.unique_identification_number;
|
|
1846
1902
|
if (uid === undefined || uid === null || uid === '') return null;
|
|
1847
1903
|
return String(uid);
|
|
1848
1904
|
}
|
|
@@ -1853,8 +1909,8 @@ export function getRuntimeProductOrigin(tempOrder, product) {
|
|
|
1853
1909
|
return tempOrder._extend.productsByUid[uid].origin;
|
|
1854
1910
|
}
|
|
1855
1911
|
var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
|
|
1856
|
-
var
|
|
1857
|
-
return item === product || getOrderProductLineUid(item) === uid || String((
|
|
1912
|
+
var _ref46, _item$product_id, _ref47, _product$product_id;
|
|
1913
|
+
return item === product || getOrderProductLineUid(item) === uid || String((_ref46 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref46 !== void 0 ? _ref46 : '') === String((_ref47 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref47 !== void 0 ? _ref47 : '');
|
|
1858
1914
|
});
|
|
1859
1915
|
var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
|
|
1860
1916
|
return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[matchedUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin) || null : null;
|