@pisell/pisellos 2.3.124 → 2.3.126
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/model/strategy/adapter/walletPass/evaluator.d.ts +0 -2
- package/dist/model/strategy/adapter/walletPass/evaluator.js +2 -4
- package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +19 -58
- package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +12 -24
- package/dist/modules/Customer/index.js +3 -6
- package/dist/modules/Customer/types.d.ts +0 -2
- package/dist/modules/Discount/index.d.ts +2 -2
- package/dist/modules/Discount/index.js +151 -37
- package/dist/modules/Discount/types.d.ts +5 -36
- package/dist/modules/Order/index.d.ts +12 -7
- package/dist/modules/Order/index.js +307 -432
- package/dist/modules/Order/types.d.ts +5 -0
- package/dist/modules/Order/utils/orderCollectionIdentity.js +12 -16
- package/dist/modules/Order/utils.d.ts +11 -1
- package/dist/modules/Order/utils.js +127 -122
- package/dist/modules/Payment/types.d.ts +1 -21
- package/dist/modules/Payment/types.js +0 -2
- package/dist/modules/Payment/walletpass.d.ts +1 -1
- package/dist/modules/Payment/walletpass.js +47 -80
- package/dist/modules/Rules/index.d.ts +2 -2
- package/dist/modules/Rules/index.js +186 -480
- package/dist/modules/Rules/types.d.ts +0 -4
- package/dist/server/modules/order/types.d.ts +0 -2
- package/dist/solution/BaseSales/index.d.ts +0 -1
- package/dist/solution/BaseSales/index.js +59 -51
- package/dist/solution/BaseSales/types.d.ts +2 -2
- package/dist/solution/BaseSales/utils/cartPromotion.js +126 -141
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.d.ts +2 -1
- package/dist/solution/BookingTicket/index.js +63 -60
- package/dist/solution/BookingTicket/types.d.ts +1 -5
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +0 -2
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +147 -338
- package/dist/solution/BookingTicket/utils/scan/cloudSearch.js +4 -8
- package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +0 -6
- package/dist/solution/BookingTicket/utils/scan/formatGlobalScan.js +6 -19
- package/dist/solution/ShopDiscount/index.d.ts +0 -2
- package/dist/solution/ShopDiscount/index.js +42 -99
- package/dist/solution/ShopDiscount/utils.d.ts +2 -4
- package/dist/solution/ShopDiscount/utils.js +23 -43
- package/dist/solution/UnifiedBookingSales/index.js +2 -2
- package/lib/model/strategy/adapter/promotion/index.js +1 -46
- package/lib/model/strategy/adapter/walletPass/evaluator.d.ts +0 -2
- package/lib/model/strategy/adapter/walletPass/evaluator.js +0 -2
- package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js +6 -35
- package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +6 -13
- package/lib/modules/Customer/index.js +1 -5
- package/lib/modules/Customer/types.d.ts +0 -2
- package/lib/modules/Discount/index.d.ts +2 -2
- package/lib/modules/Discount/index.js +129 -23
- package/lib/modules/Discount/types.d.ts +5 -36
- package/lib/modules/Order/index.d.ts +12 -7
- package/lib/modules/Order/index.js +107 -215
- package/lib/modules/Order/types.d.ts +5 -0
- package/lib/modules/Order/utils/orderCollectionIdentity.js +11 -14
- package/lib/modules/Order/utils.d.ts +11 -1
- package/lib/modules/Order/utils.js +45 -39
- package/lib/modules/Payment/types.d.ts +1 -21
- package/lib/modules/Payment/types.js +0 -1
- package/lib/modules/Payment/walletpass.d.ts +1 -1
- package/lib/modules/Payment/walletpass.js +9 -29
- package/lib/modules/Rules/index.d.ts +2 -2
- package/lib/modules/Rules/index.js +110 -357
- package/lib/modules/Rules/types.d.ts +0 -4
- package/lib/server/modules/order/types.d.ts +0 -2
- package/lib/solution/BaseSales/index.d.ts +0 -1
- package/lib/solution/BaseSales/index.js +12 -5
- package/lib/solution/BaseSales/types.d.ts +2 -2
- package/lib/solution/BaseSales/utils/cartPromotion.js +4 -12
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.d.ts +2 -1
- package/lib/solution/BookingTicket/index.js +33 -36
- package/lib/solution/BookingTicket/types.d.ts +1 -5
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts +0 -2
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +42 -174
- package/lib/solution/BookingTicket/utils/scan/cloudSearch.js +4 -8
- package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.d.ts +0 -6
- package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js +3 -11
- package/lib/solution/ShopDiscount/index.d.ts +0 -2
- package/lib/solution/ShopDiscount/index.js +9 -55
- package/lib/solution/ShopDiscount/utils.d.ts +2 -4
- package/lib/solution/ShopDiscount/utils.js +25 -42
- package/lib/solution/UnifiedBookingSales/index.js +2 -2
- package/package.json +1 -1
- package/dist/modules/Discount/availability.d.ts +0 -7
- package/dist/modules/Discount/availability.js +0 -49
- package/dist/modules/Discount/entitlementPass.d.ts +0 -34
- package/dist/modules/Discount/entitlementPass.js +0 -147
- package/lib/modules/Discount/availability.d.ts +0 -7
- package/lib/modules/Discount/availability.js +0 -43
- package/lib/modules/Discount/entitlementPass.d.ts +0 -34
- package/lib/modules/Discount/entitlementPass.js +0 -141
|
@@ -204,6 +204,10 @@ export interface PointCardSnapshotItem {
|
|
|
204
204
|
par_value: string;
|
|
205
205
|
used_par_value: string;
|
|
206
206
|
}
|
|
207
|
+
export interface PointCardSnapshotMergeContext {
|
|
208
|
+
customerId?: number | string | null;
|
|
209
|
+
orderIdentity?: OrderIdentitySnapshot | null;
|
|
210
|
+
}
|
|
207
211
|
export interface VirtualCurrencySnapshotItem {
|
|
208
212
|
id: number | string;
|
|
209
213
|
tag: 'virtual_currency';
|
|
@@ -976,6 +980,7 @@ export interface OrderModuleAPI {
|
|
|
976
980
|
getDiscountList: () => Discount[];
|
|
977
981
|
getAvailableWalletIds: () => number[];
|
|
978
982
|
getCustomerWalletPrepareConfigEpoch: () => number;
|
|
983
|
+
mergePointCardSnapshotCodes: (walletPassList: unknown, context?: PointCardSnapshotMergeContext) => PointCardSnapshotItem[];
|
|
979
984
|
applyDiscount: () => void;
|
|
980
985
|
/**
|
|
981
986
|
* 注入促销评估器。
|
|
@@ -12,7 +12,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
12
12
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
13
13
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
14
14
|
import { cloneDeep } from 'lodash-es';
|
|
15
|
-
import { isFullCoveragePass } from "../../Discount/entitlementPass";
|
|
16
15
|
var IDENTITY_CONFIG = {
|
|
17
16
|
product: {
|
|
18
17
|
persistentIdField: 'order_detail_id',
|
|
@@ -75,25 +74,22 @@ export function setOrderCollectionUid(kind, item, uid) {
|
|
|
75
74
|
delete record[uidField];
|
|
76
75
|
return record;
|
|
77
76
|
}
|
|
78
|
-
function
|
|
79
|
-
var _ref, _ref2,
|
|
80
|
-
var
|
|
81
|
-
|
|
77
|
+
function getGoodPassResourceId(product) {
|
|
78
|
+
var _ref, _ref2, _goodPass$discount$re, _goodPass$discount;
|
|
79
|
+
var goodPass = (product.discount_list || []).find(function (item) {
|
|
80
|
+
var _item$discount, _item$discount2;
|
|
81
|
+
var type = (item === null || item === void 0 ? void 0 : item.type) || (item === null || item === void 0 ? void 0 : item.tag) || (item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.type) || (item === null || item === void 0 || (_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.tag);
|
|
82
|
+
return type === 'good_pass';
|
|
82
83
|
});
|
|
83
|
-
if (!
|
|
84
|
-
var resourceId = (_ref = (_ref2 = (
|
|
85
|
-
|
|
86
|
-
return {
|
|
87
|
-
type: String(pass.type || pass.tag),
|
|
88
|
-
resourceId: String(resourceId)
|
|
89
|
-
};
|
|
84
|
+
if (!goodPass) return null;
|
|
85
|
+
var resourceId = (_ref = (_ref2 = (_goodPass$discount$re = (_goodPass$discount = goodPass.discount) === null || _goodPass$discount === void 0 ? void 0 : _goodPass$discount.resource_id) !== null && _goodPass$discount$re !== void 0 ? _goodPass$discount$re : goodPass.resource_id) !== null && _ref2 !== void 0 ? _ref2 : goodPass.discount_id) !== null && _ref !== void 0 ? _ref : goodPass.id;
|
|
86
|
+
return isBlankOrderCollectionIdentity(resourceId) ? null : String(resourceId);
|
|
90
87
|
}
|
|
91
88
|
function buildSplitProductUid(originalUid, product, duplicateOrdinal) {
|
|
92
89
|
var encodedOriginalUid = encodeURIComponent(originalUid);
|
|
93
|
-
var
|
|
94
|
-
if (
|
|
95
|
-
|
|
96
|
-
return "os-split:product:".concat(encodedOriginalUid, ":").concat(passType, ":").concat(encodeURIComponent(passIdentity.resourceId), ":").concat(duplicateOrdinal);
|
|
90
|
+
var resourceId = getGoodPassResourceId(product);
|
|
91
|
+
if (resourceId) {
|
|
92
|
+
return "os-split:product:".concat(encodedOriginalUid, ":good-pass:").concat(encodeURIComponent(resourceId), ":").concat(duplicateOrdinal);
|
|
97
93
|
}
|
|
98
94
|
return "os-split:product:".concat(encodedOriginalUid, ":duplicate:").concat(duplicateOrdinal);
|
|
99
95
|
}
|
|
@@ -18,6 +18,16 @@ export interface OrderProductsDepositSummary {
|
|
|
18
18
|
import type { WindowPlugin } from '../../plugins';
|
|
19
19
|
export declare function normalizePointCardSnapshotItem(value: unknown): PointCardSnapshotItem | null;
|
|
20
20
|
export declare function buildPointCardSnapshotFromWalletPassList(value: unknown): PointCardSnapshotItem[];
|
|
21
|
+
export declare function collectPointCardSnapshotCodeCandidates(value: unknown): Array<{
|
|
22
|
+
id: string;
|
|
23
|
+
code: string;
|
|
24
|
+
}>;
|
|
25
|
+
/**
|
|
26
|
+
* Payment 的 WalletPass 列表包含实例 code,而 prepare/config 通常只提供
|
|
27
|
+
* 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code,避免后到的运行态
|
|
28
|
+
* 数据覆盖下单时已经冻结的卡名称和余额。
|
|
29
|
+
*/
|
|
30
|
+
export declare function mergePointCardSnapshotCodes(snapshotsValue: unknown, walletPassesValue: unknown): PointCardSnapshotItem[];
|
|
21
31
|
export declare function normalizeVirtualCurrencySnapshotItem(value: unknown): VirtualCurrencySnapshotItem | null;
|
|
22
32
|
export declare function buildVirtualCurrencySnapshotFromList(value: unknown): VirtualCurrencySnapshotItem[];
|
|
23
33
|
export declare function normalizeOrderMetaList(value: unknown): OrderMetaList | undefined;
|
|
@@ -161,7 +171,7 @@ export declare function resolveManualOverrideLineOriginalPrice(params: {
|
|
|
161
171
|
* // => -4
|
|
162
172
|
*/
|
|
163
173
|
export declare function resolveEffectivePerUnitDiscount(product: Record<string, any>): number;
|
|
164
|
-
export declare function createDefaultOrderRulesHooks(
|
|
174
|
+
export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
|
|
165
175
|
/**
|
|
166
176
|
* 通过 session 类商品的开始时间结束时间生成商品的时长
|
|
167
177
|
* @param {CartItem} cartItem
|
|
@@ -5,10 +5,6 @@ var _excluded = ["custom_product_bundle_map_id"],
|
|
|
5
5
|
_excluded5 = ["collect_pax", "table_occupancy_duration", "cart_settlement_key", "cart_settlement_snapshot", "legal_currency_snapshot"];
|
|
6
6
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
7
7
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
8
|
-
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
9
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
10
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
11
|
-
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
12
8
|
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
13
9
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
14
10
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
@@ -17,19 +13,21 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
17
13
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
18
14
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
19
15
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
20
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
21
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
22
16
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
23
17
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
18
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
19
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
20
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
21
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
22
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
23
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
24
24
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
25
25
|
import dayjs from "dayjs";
|
|
26
|
-
import customParseFormat from 'dayjs/plugin/customParseFormat';
|
|
27
26
|
import Decimal from 'decimal.js';
|
|
28
27
|
import { getProductHolderConfig } from "../Holder/utils";
|
|
29
28
|
import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
|
|
30
29
|
import { createUuidV4 } from "./utils/orderCollectionIdentity";
|
|
31
30
|
import { encodeSalesNotes } from "./salesNotes";
|
|
32
|
-
dayjs.extend(customParseFormat);
|
|
33
31
|
var POINT_CARD_SNAPSHOT_TAG = 'point_card';
|
|
34
32
|
var VIRTUAL_CURRENCY_SNAPSHOT_TAG = 'virtual_currency';
|
|
35
33
|
function isPlainObject(value) {
|
|
@@ -74,6 +72,52 @@ export function buildPointCardSnapshotFromWalletPassList(value) {
|
|
|
74
72
|
return result;
|
|
75
73
|
}, []);
|
|
76
74
|
}
|
|
75
|
+
export function collectPointCardSnapshotCodeCandidates(value) {
|
|
76
|
+
if (!Array.isArray(value)) return [];
|
|
77
|
+
var codeById = new Map();
|
|
78
|
+
value.forEach(function (item) {
|
|
79
|
+
var _item$id;
|
|
80
|
+
if (!isPlainObject(item)) return;
|
|
81
|
+
var id = normalizeSnapshotScalar((_item$id = item.id) !== null && _item$id !== void 0 ? _item$id : item.voucher_id);
|
|
82
|
+
var code = normalizeSnapshotScalar(item.code);
|
|
83
|
+
if (id === undefined || code === undefined) return;
|
|
84
|
+
var identity = String(id).trim();
|
|
85
|
+
var normalizedCode = String(code).trim();
|
|
86
|
+
if (!identity || !normalizedCode || codeById.has(identity)) return;
|
|
87
|
+
codeById.set(identity, normalizedCode);
|
|
88
|
+
});
|
|
89
|
+
return _toConsumableArray(codeById).map(function (_ref) {
|
|
90
|
+
var _ref2 = _slicedToArray(_ref, 2),
|
|
91
|
+
id = _ref2[0],
|
|
92
|
+
code = _ref2[1];
|
|
93
|
+
return {
|
|
94
|
+
id: id,
|
|
95
|
+
code: code
|
|
96
|
+
};
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Payment 的 WalletPass 列表包含实例 code,而 prepare/config 通常只提供
|
|
102
|
+
* 卡名称和余额。按实例 ID 仅补齐 Snapshot 缺失的 code,避免后到的运行态
|
|
103
|
+
* 数据覆盖下单时已经冻结的卡名称和余额。
|
|
104
|
+
*/
|
|
105
|
+
export function mergePointCardSnapshotCodes(snapshotsValue, walletPassesValue) {
|
|
106
|
+
var snapshots = buildPointCardSnapshotFromWalletPassList(snapshotsValue);
|
|
107
|
+
if (!snapshots.length || !Array.isArray(walletPassesValue)) return snapshots;
|
|
108
|
+
var codeById = new Map(collectPointCardSnapshotCodeCandidates(walletPassesValue).map(function (_ref3) {
|
|
109
|
+
var id = _ref3.id,
|
|
110
|
+
code = _ref3.code;
|
|
111
|
+
return [id, code];
|
|
112
|
+
}));
|
|
113
|
+
return snapshots.map(function (snapshot) {
|
|
114
|
+
if (snapshot.code) return snapshot;
|
|
115
|
+
var code = codeById.get(String(snapshot.id).trim());
|
|
116
|
+
return code ? _objectSpread(_objectSpread({}, snapshot), {}, {
|
|
117
|
+
code: code
|
|
118
|
+
}) : snapshot;
|
|
119
|
+
});
|
|
120
|
+
}
|
|
77
121
|
function normalizeSnapshotNameMap(value) {
|
|
78
122
|
if (typeof value === 'string' || typeof value === 'number') {
|
|
79
123
|
var normalizedText = String(value).trim();
|
|
@@ -82,10 +126,10 @@ function normalizeSnapshotNameMap(value) {
|
|
|
82
126
|
} : {};
|
|
83
127
|
}
|
|
84
128
|
if (!isPlainObject(value)) return {};
|
|
85
|
-
return Object.entries(value).reduce(function (result,
|
|
86
|
-
var
|
|
87
|
-
locale =
|
|
88
|
-
text =
|
|
129
|
+
return Object.entries(value).reduce(function (result, _ref4) {
|
|
130
|
+
var _ref5 = _slicedToArray(_ref4, 2),
|
|
131
|
+
locale = _ref5[0],
|
|
132
|
+
text = _ref5[1];
|
|
89
133
|
if (!locale.trim()) return result;
|
|
90
134
|
if (typeof text !== 'string' && typeof text !== 'number') return result;
|
|
91
135
|
var normalizedText = String(text).trim();
|
|
@@ -211,13 +255,13 @@ export function composeLinePrice(params) {
|
|
|
211
255
|
_step;
|
|
212
256
|
try {
|
|
213
257
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
214
|
-
var
|
|
258
|
+
var _ref6, _item$num;
|
|
215
259
|
var item = _step.value;
|
|
216
260
|
// markdown(减价)按带符号净额取减;markup/原价维持相加。
|
|
217
261
|
var signedUnit = getBundleSignedUnit(item, {
|
|
218
262
|
useOriginal: useOriginalBundle
|
|
219
263
|
});
|
|
220
|
-
var rawNum = (
|
|
264
|
+
var rawNum = (_ref6 = (_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref6 !== void 0 ? _ref6 : 1;
|
|
221
265
|
var num = new Decimal(Number(rawNum) || 0);
|
|
222
266
|
total = total.plus(signedUnit.times(num));
|
|
223
267
|
}
|
|
@@ -281,12 +325,12 @@ function getSafeOrderProductNum(num) {
|
|
|
281
325
|
return Math.floor(parsedNum);
|
|
282
326
|
}
|
|
283
327
|
function getOrderProductDepositUnitTotal(product) {
|
|
284
|
-
var
|
|
328
|
+
var _ref7;
|
|
285
329
|
var metadata = product.metadata || {};
|
|
286
330
|
var paymentPrice = metadata.main_product_attached_bundle_payment_price;
|
|
287
331
|
var mainSellingPrice = metadata.main_product_selling_price;
|
|
288
332
|
var fallbackPrice = product.selling_price;
|
|
289
|
-
return new Decimal(Number((
|
|
333
|
+
return new Decimal(Number((_ref7 = paymentPrice !== null && paymentPrice !== void 0 ? paymentPrice : mainSellingPrice) !== null && _ref7 !== void 0 ? _ref7 : fallbackPrice) || 0);
|
|
290
334
|
}
|
|
291
335
|
function normalizeDepositProtocols(protocols) {
|
|
292
336
|
if (!Array.isArray(protocols)) return [];
|
|
@@ -335,13 +379,13 @@ function handleOrderProductDeposit(params) {
|
|
|
335
379
|
};
|
|
336
380
|
}
|
|
337
381
|
function resolveOrderProductDepositSource(product, runtimeOrigin) {
|
|
338
|
-
var
|
|
382
|
+
var _ref8, _record$custom_deposi, _ref9, _record$variant;
|
|
339
383
|
var record = product;
|
|
340
384
|
var origin = record._origin || runtimeOrigin || {};
|
|
341
385
|
var originProduct = origin.product || {};
|
|
342
386
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, originProduct), origin), record), {}, {
|
|
343
|
-
custom_deposit_data: (
|
|
344
|
-
variant: (
|
|
387
|
+
custom_deposit_data: (_ref8 = (_record$custom_deposi = record.custom_deposit_data) !== null && _record$custom_deposi !== void 0 ? _record$custom_deposi : origin.custom_deposit_data) !== null && _ref8 !== void 0 ? _ref8 : originProduct.custom_deposit_data,
|
|
388
|
+
variant: (_ref9 = (_record$variant = record.variant) !== null && _record$variant !== void 0 ? _record$variant : origin.variant) !== null && _ref9 !== void 0 ? _ref9 : originProduct.variant
|
|
345
389
|
});
|
|
346
390
|
}
|
|
347
391
|
function getOrderProductDeposit(product, runtimeOrigin) {
|
|
@@ -493,12 +537,12 @@ export function isMarkdownBundle(bundle) {
|
|
|
493
537
|
* - markup(加价)/原价子商品:维持 `+(bundle_selling_price ?? price)`,行为不变。
|
|
494
538
|
*/
|
|
495
539
|
export function getBundleSignedUnit(bundle, options) {
|
|
496
|
-
var _options$useOriginal,
|
|
540
|
+
var _options$useOriginal, _ref16, _bundle$original_pric2, _bundle$bundle_sellin;
|
|
497
541
|
if (!bundle || _typeof(bundle) !== 'object') return new Decimal(0);
|
|
498
542
|
var useOriginal = (_options$useOriginal = options === null || options === void 0 ? void 0 : options.useOriginal) !== null && _options$useOriginal !== void 0 ? _options$useOriginal : false;
|
|
499
543
|
if (isMarkdownBundle(bundle)) {
|
|
500
|
-
var
|
|
501
|
-
var catalog = useOriginal ? (
|
|
544
|
+
var _ref10, _ref11, _ref12, _bundle$original_pric, _ref13, _ref14, _ref15, _bundle$custom_price;
|
|
545
|
+
var catalog = useOriginal ? (_ref10 = (_ref11 = (_ref12 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref12 !== void 0 ? _ref12 : bundle.custom_price) !== null && _ref11 !== void 0 ? _ref11 : bundle.base_price) !== null && _ref10 !== void 0 ? _ref10 : bundle.price : (_ref13 = (_ref14 = (_ref15 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref15 !== void 0 ? _ref15 : bundle.original_price) !== null && _ref14 !== void 0 ? _ref14 : bundle.base_price) !== null && _ref13 !== void 0 ? _ref13 : bundle.price;
|
|
502
546
|
if (catalog !== undefined && catalog !== null && catalog !== '') {
|
|
503
547
|
var raw = new Decimal(Number(catalog) || 0);
|
|
504
548
|
// 负值表示价格已是「带符号净额」(如 cart/changePrice 产出的 -3.7),直接取用不再扣 option,
|
|
@@ -509,7 +553,7 @@ export function getBundleSignedUnit(bundle, options) {
|
|
|
509
553
|
// 仅剩净额(无毛价)兜底:直接取负,不再扣 option
|
|
510
554
|
return new Decimal(Number(bundle.bundle_selling_price) || 0).abs().negated();
|
|
511
555
|
}
|
|
512
|
-
var rawPrice = useOriginal ? (
|
|
556
|
+
var rawPrice = useOriginal ? (_ref16 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref16 !== void 0 ? _ref16 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
|
|
513
557
|
return new Decimal(Number(rawPrice) || 0);
|
|
514
558
|
}
|
|
515
559
|
|
|
@@ -613,22 +657,6 @@ function resolveSubmitBundleMapId(bundle) {
|
|
|
613
657
|
}
|
|
614
658
|
return undefined;
|
|
615
659
|
}
|
|
616
|
-
function ensureSubmitDiscountIdentity(discount) {
|
|
617
|
-
if (!discount || _typeof(discount) !== 'object' || Array.isArray(discount)) {
|
|
618
|
-
return discount;
|
|
619
|
-
}
|
|
620
|
-
var discountRecord = discount;
|
|
621
|
-
var metadata = discountRecord.metadata && _typeof(discountRecord.metadata) === 'object' && !Array.isArray(discountRecord.metadata) ? discountRecord.metadata : {};
|
|
622
|
-
var uniqueIdentificationNumber = metadata.unique_identification_number;
|
|
623
|
-
if (uniqueIdentificationNumber !== undefined && uniqueIdentificationNumber !== null && String(uniqueIdentificationNumber).trim() !== '') {
|
|
624
|
-
return discount;
|
|
625
|
-
}
|
|
626
|
-
return _objectSpread(_objectSpread({}, discountRecord), {}, {
|
|
627
|
-
metadata: _objectSpread(_objectSpread({}, metadata), {}, {
|
|
628
|
-
unique_identification_number: createUuidV4()
|
|
629
|
-
})
|
|
630
|
-
});
|
|
631
|
-
}
|
|
632
660
|
function collectSubmitProductDiscountList(product) {
|
|
633
661
|
var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
|
|
634
662
|
var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
|
|
@@ -664,7 +692,7 @@ function collectSubmitProductDiscountList(product) {
|
|
|
664
692
|
} finally {
|
|
665
693
|
_iterator5.f();
|
|
666
694
|
}
|
|
667
|
-
return normalizeOrderProductDiscountList(submitDiscountList
|
|
695
|
+
return normalizeOrderProductDiscountList(submitDiscountList);
|
|
668
696
|
}
|
|
669
697
|
|
|
670
698
|
/**
|
|
@@ -737,37 +765,14 @@ export function resolveEffectivePerUnitDiscount(product) {
|
|
|
737
765
|
if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;
|
|
738
766
|
return fromList + (originalPrice - finalPrice);
|
|
739
767
|
}
|
|
740
|
-
export function createDefaultOrderRulesHooks(
|
|
741
|
-
var getProductStartDate = function getProductStartDate(product) {
|
|
742
|
-
var _ref14, _product$metadata$uni, _product$metadata2, _ref15, _product$booking_uid, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
|
|
743
|
-
var productUid = String((_ref14 = (_product$metadata$uni = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number) !== null && _ref14 !== void 0 ? _ref14 : '');
|
|
744
|
-
var bookingUid = String((_ref15 = (_product$booking_uid = product.booking_uid) !== null && _product$booking_uid !== void 0 ? _product$booking_uid : (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_uid) !== null && _ref15 !== void 0 ? _ref15 : '');
|
|
745
|
-
// 每次读取当前 bookings,覆盖改期、订单回显以及直接调用 Rules 的选券入口。
|
|
746
|
-
var bookings = (getBookings === null || getBookings === void 0 ? void 0 : getBookings()) || [];
|
|
747
|
-
var booking = bookings.find(function (item) {
|
|
748
|
-
var _ref16, _item$product_uid, _item$metadata3;
|
|
749
|
-
return productUid && String((_ref16 = (_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 && _ref16 !== void 0 ? _ref16 : '') === productUid;
|
|
750
|
-
}) || bookings.find(function (item) {
|
|
751
|
-
var _ref17, _item$metadata$unique, _item$metadata4;
|
|
752
|
-
return bookingUid && String((_ref17 = (_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 && _ref17 !== void 0 ? _ref17 : '') === bookingUid;
|
|
753
|
-
});
|
|
754
|
-
if (booking) {
|
|
755
|
-
// 严格解析并保留 Invalid Date,让公共时间校验拒绝缺失/非法时间,避免回退到当前时间。
|
|
756
|
-
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);
|
|
757
|
-
}
|
|
758
|
-
if (getBookings && (bookingUid || product.booking_id || (_product$metadata4 = product.metadata) !== null && _product$metadata4 !== void 0 && _product$metadata4.booking_id)) {
|
|
759
|
-
return dayjs('');
|
|
760
|
-
}
|
|
761
|
-
var legacyStartDate = ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate);
|
|
762
|
-
return legacyStartDate ? dayjs(legacyStartDate) : undefined;
|
|
763
|
-
};
|
|
768
|
+
export function createDefaultOrderRulesHooks() {
|
|
764
769
|
var toUnitPriceString = function toUnitPriceString(totalLike, num) {
|
|
765
770
|
var effectiveNum = Number(num) > 0 ? Number(num) : 1;
|
|
766
771
|
return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
|
|
767
772
|
};
|
|
768
773
|
var getBundleIdentity = function getBundleIdentity(bundle) {
|
|
769
|
-
var
|
|
770
|
-
return [(
|
|
774
|
+
var _ref17, _bundle$bundle_id, _ref18, _ref19, _bundle$bundle_produc, _ref20, _ref21, _bundle$bundle_varian, _ref22, _bundle$bundle_group_;
|
|
775
|
+
return [(_ref17 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref17 !== void 0 ? _ref17 : '', (_ref18 = (_ref19 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref19 !== void 0 ? _ref19 : bundle.product_id) !== null && _ref18 !== void 0 ? _ref18 : '', (_ref20 = (_ref21 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref21 !== void 0 ? _ref21 : bundle.product_variant_id) !== null && _ref20 !== void 0 ? _ref20 : 0, (_ref22 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref22 !== void 0 ? _ref22 : ''].join('|');
|
|
771
776
|
};
|
|
772
777
|
var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
|
|
773
778
|
if (!Array.isArray(rulesBundle)) return rulesBundle;
|
|
@@ -777,7 +782,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
|
|
|
777
782
|
currentByIdentity.set(getBundleIdentity(bundle), bundle);
|
|
778
783
|
});
|
|
779
784
|
return rulesBundle.map(function (bundle) {
|
|
780
|
-
var _bundle$price_type_ex2,
|
|
785
|
+
var _bundle$price_type_ex2, _ref23, _ref24, _current$price, _ref25, _ref26, _ref27, _current$original_pri;
|
|
781
786
|
if (!bundle || _typeof(bundle) !== 'object') return bundle;
|
|
782
787
|
var current = currentByIdentity.get(getBundleIdentity(bundle));
|
|
783
788
|
if (!current) return bundle;
|
|
@@ -786,8 +791,8 @@ export function createDefaultOrderRulesHooks(getBookings) {
|
|
|
786
791
|
} : {});
|
|
787
792
|
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';
|
|
788
793
|
if (!isProductPriceBundle) return bundleWithDisplayFields;
|
|
789
|
-
var sourcePrice = (
|
|
790
|
-
var originalPrice = (
|
|
794
|
+
var sourcePrice = (_ref23 = (_ref24 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref24 !== void 0 ? _ref24 : current.original_price) !== null && _ref23 !== void 0 ? _ref23 : current.bundle_selling_price;
|
|
795
|
+
var originalPrice = (_ref25 = (_ref26 = (_ref27 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref27 !== void 0 ? _ref27 : current.price) !== null && _ref26 !== void 0 ? _ref26 : current.custom_price) !== null && _ref25 !== void 0 ? _ref25 : sourcePrice;
|
|
791
796
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
|
|
792
797
|
price: sourcePrice
|
|
793
798
|
} : {}), originalPrice !== undefined ? {
|
|
@@ -799,7 +804,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
|
|
|
799
804
|
};
|
|
800
805
|
return {
|
|
801
806
|
getProduct: function getProduct(product) {
|
|
802
|
-
var _product$
|
|
807
|
+
var _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6, _metadataAny$_promoti;
|
|
803
808
|
// source_product_price 是权威源;兜底链:source → mainSelling − options(反推)→ 行 selling_price
|
|
804
809
|
var metadataAny = product.metadata || {};
|
|
805
810
|
var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
|
|
@@ -826,7 +831,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
|
|
|
826
831
|
// 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
|
|
827
832
|
// 不透明 identity 契约下,normalizeOrderProduct / hydrate 已保证唯一值存在;
|
|
828
833
|
// 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
|
|
829
|
-
_id: (_product$
|
|
834
|
+
_id: (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.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)),
|
|
830
835
|
// Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option,
|
|
831
836
|
// 所以这里必须喂 source-level(不含 option、不含 bundle、不含折扣)单价,避免双加 option。
|
|
832
837
|
price: sourcePrice,
|
|
@@ -838,23 +843,23 @@ export function createDefaultOrderRulesHooks(getBookings) {
|
|
|
838
843
|
num: product.num || 1,
|
|
839
844
|
discount_list: product.discount_list || [],
|
|
840
845
|
bundle: product.product_bundle || [],
|
|
841
|
-
booking_id: ((_product$
|
|
846
|
+
booking_id: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_id) || null,
|
|
842
847
|
isClient: false,
|
|
843
848
|
// 勿写死 false:否则 Rules 不会走 total≠origin_total 的手动价推断,
|
|
844
849
|
// 无券时会把 bundle 价还原成 original_price(手动改价套餐会从 20 回到 30)。
|
|
845
850
|
isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
|
|
846
|
-
holder_id: (_product$
|
|
847
|
-
startDate:
|
|
851
|
+
holder_id: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.holder_id,
|
|
852
|
+
startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate),
|
|
848
853
|
main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
|
|
849
854
|
inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
|
|
850
855
|
_promotion: metadataAny._promotion
|
|
851
856
|
};
|
|
852
857
|
},
|
|
853
858
|
setProduct: function setProduct(product, values) {
|
|
854
|
-
var
|
|
855
|
-
var nextNum = Number((
|
|
859
|
+
var _ref28, _values$quantity, _ref29, _metadataAny$source_p, _values$discount_list, _values$quantity2;
|
|
860
|
+
var nextNum = Number((_ref28 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref28 !== void 0 ? _ref28 : 1) || 1;
|
|
856
861
|
var metadataAny = product.metadata || {};
|
|
857
|
-
var existedSource = (
|
|
862
|
+
var existedSource = (_ref29 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref29 !== void 0 ? _ref29 : '0';
|
|
858
863
|
var nextOptions = getProductSkuOptions(product);
|
|
859
864
|
var optionSum = sumOptionUnitPrice(nextOptions);
|
|
860
865
|
|
|
@@ -1065,7 +1070,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1065
1070
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1066
1071
|
if (!Array.isArray(bundle)) return [];
|
|
1067
1072
|
return bundle.map(function (b) {
|
|
1068
|
-
var
|
|
1073
|
+
var _ref30, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref31, _rawBundle$price_type, _ref32, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
|
|
1069
1074
|
var rawBundle = b && _typeof(b) === 'object' ? b : {};
|
|
1070
1075
|
var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
|
|
1071
1076
|
var _customProductBundleMapId = existedMetadata.custom_product_bundle_map_id,
|
|
@@ -1076,7 +1081,7 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1076
1081
|
var sellingPrice = formatOptions.virtualSettlementMode ? '0.00' : getBundleSellingMagnitude(rawBundle).toFixed(2);
|
|
1077
1082
|
// payment 价由整单折扣均摊层产出;缺省(无折扣)时与 selling 净额同义。
|
|
1078
1083
|
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;
|
|
1079
|
-
var priceValue = formatOptions.virtualSettlementMode ? 0 : (
|
|
1084
|
+
var priceValue = formatOptions.virtualSettlementMode ? 0 : (_ref30 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref30 !== void 0 ? _ref30 : rawBundle.bundle_selling_price;
|
|
1080
1085
|
var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
|
|
1081
1086
|
var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
|
|
1082
1087
|
var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
|
|
@@ -1095,8 +1100,8 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1095
1100
|
extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
|
|
1096
1101
|
extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
|
|
1097
1102
|
price: priceValue,
|
|
1098
|
-
price_type: (
|
|
1099
|
-
price_type_ext: (
|
|
1103
|
+
price_type: (_ref31 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref31 !== void 0 ? _ref31 : '',
|
|
1104
|
+
price_type_ext: (_ref32 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref32 !== void 0 ? _ref32 : '',
|
|
1100
1105
|
bundle_selling_price: sellingPrice,
|
|
1101
1106
|
bundle_payment_price: paymentPrice,
|
|
1102
1107
|
option: formatSubmitOptionItems(rawBundle.option, formatOptions),
|
|
@@ -1132,11 +1137,11 @@ function formatSubmitBundleItems(bundle) {
|
|
|
1132
1137
|
* 法币仅做字段/metadata 裁剪;虚拟币在出站前再次执行零加价与固定单价断言。
|
|
1133
1138
|
*/
|
|
1134
1139
|
function normalizeSubmitProduct(product) {
|
|
1135
|
-
var
|
|
1140
|
+
var _ref34, _submitProduct$bundle, _rawMetadata$product_, _rawMetadata$selected, _rawMetadata$selected2, _submitProduct$produc, _submitProduct$paymen;
|
|
1136
1141
|
var formatOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1137
|
-
var
|
|
1138
|
-
_runtimeUid =
|
|
1139
|
-
submitProduct = _objectWithoutProperties(
|
|
1142
|
+
var _ref33 = product,
|
|
1143
|
+
_runtimeUid = _ref33.unique_identification_number,
|
|
1144
|
+
submitProduct = _objectWithoutProperties(_ref33, _excluded2);
|
|
1140
1145
|
var num = submitProduct.num,
|
|
1141
1146
|
_productSurchargeFee = submitProduct.surcharge_fee,
|
|
1142
1147
|
_deprecatedDiscountAmount = submitProduct.discount_amount,
|
|
@@ -1153,7 +1158,7 @@ function normalizeSubmitProduct(product) {
|
|
|
1153
1158
|
// 兼容历史 BigSale 编辑链路:bundle_edit 曾被写入 metadata,
|
|
1154
1159
|
// 出站时需提升到商品顶层;套餐未编辑时也必须显式提交 0。
|
|
1155
1160
|
var hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
|
|
1156
|
-
var bundleEdit = (
|
|
1161
|
+
var bundleEdit = (_ref34 = (_submitProduct$bundle = submitProduct.bundle_edit) !== null && _submitProduct$bundle !== void 0 ? _submitProduct$bundle : rawMetadata.bundle_edit) !== null && _ref34 !== void 0 ? _ref34 : hasProductBundle ? 0 : undefined;
|
|
1157
1162
|
var cleanMetadata = {};
|
|
1158
1163
|
if (rawMetadata.unique_identification_number) {
|
|
1159
1164
|
cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
|
|
@@ -1384,7 +1389,7 @@ export function resolveSubmitOrderType(params) {
|
|
|
1384
1389
|
return 'virtual';
|
|
1385
1390
|
}
|
|
1386
1391
|
export function buildSubmitPayload(params) {
|
|
1387
|
-
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_,
|
|
1392
|
+
var _tempOrder$metadata2, _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref36, _tempOrder$is_price_i, _tempOrder$is_deposit, _tempOrder$_extend, _enhancedPayload$summ;
|
|
1388
1393
|
var tempOrder = params.tempOrder,
|
|
1389
1394
|
cacheId = params.cacheId,
|
|
1390
1395
|
_params$now = params.now,
|
|
@@ -1398,29 +1403,29 @@ export function buildSubmitPayload(params) {
|
|
|
1398
1403
|
var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
|
|
1399
1404
|
var bookingUuid = createUuidV4();
|
|
1400
1405
|
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';
|
|
1401
|
-
var
|
|
1402
|
-
_extend =
|
|
1403
|
-
_relationId =
|
|
1404
|
-
_tableFormId =
|
|
1405
|
-
_resourceId =
|
|
1406
|
-
_summary =
|
|
1407
|
-
_lastOrderInfo =
|
|
1408
|
-
_paidAmount =
|
|
1409
|
-
_shopId =
|
|
1410
|
-
_shopNote =
|
|
1411
|
-
_shopServiceType =
|
|
1412
|
-
_startTime =
|
|
1413
|
-
_customer =
|
|
1414
|
-
_discountList =
|
|
1415
|
-
_orderMetaList =
|
|
1416
|
-
_rootTaxFee =
|
|
1417
|
-
_totalAmount =
|
|
1418
|
-
_totalRefundAmount =
|
|
1419
|
-
_createDate =
|
|
1420
|
-
_holderId =
|
|
1421
|
-
_paymentStatus =
|
|
1422
|
-
_notes =
|
|
1423
|
-
tempOrderRest = _objectWithoutProperties(
|
|
1406
|
+
var _ref35 = tempOrder,
|
|
1407
|
+
_extend = _ref35._extend,
|
|
1408
|
+
_relationId = _ref35.relation_id,
|
|
1409
|
+
_tableFormId = _ref35.table_form_id,
|
|
1410
|
+
_resourceId = _ref35.resource_id,
|
|
1411
|
+
_summary = _ref35.summary,
|
|
1412
|
+
_lastOrderInfo = _ref35.lastOrderInfo,
|
|
1413
|
+
_paidAmount = _ref35.paid_amount,
|
|
1414
|
+
_shopId = _ref35.shop_id,
|
|
1415
|
+
_shopNote = _ref35.shop_note,
|
|
1416
|
+
_shopServiceType = _ref35.shop_service_type,
|
|
1417
|
+
_startTime = _ref35.start_time,
|
|
1418
|
+
_customer = _ref35.customer,
|
|
1419
|
+
_discountList = _ref35.discount_list,
|
|
1420
|
+
_orderMetaList = _ref35.order_meta_list,
|
|
1421
|
+
_rootTaxFee = _ref35.tax_fee,
|
|
1422
|
+
_totalAmount = _ref35.total_amount,
|
|
1423
|
+
_totalRefundAmount = _ref35.total_refund_amount,
|
|
1424
|
+
_createDate = _ref35.create_date,
|
|
1425
|
+
_holderId = _ref35.holder_id,
|
|
1426
|
+
_paymentStatus = _ref35.payment_status,
|
|
1427
|
+
_notes = _ref35.notes,
|
|
1428
|
+
tempOrderRest = _objectWithoutProperties(_ref35, _excluded4);
|
|
1424
1429
|
var resolvedBusinessCode = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code;
|
|
1425
1430
|
var normalizedOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
|
|
1426
1431
|
var submitType = resolveSubmitOrderType({
|
|
@@ -1445,7 +1450,7 @@ export function buildSubmitPayload(params) {
|
|
|
1445
1450
|
type: submitType,
|
|
1446
1451
|
business_code: resolvedBusinessCode,
|
|
1447
1452
|
sales_channel: tempOrder.sales_channel || 'my_pisel',
|
|
1448
|
-
order_sales_channel: (
|
|
1453
|
+
order_sales_channel: (_ref36 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref36 !== void 0 ? _ref36 : 'online_store',
|
|
1449
1454
|
status: tempOrder.status || 'normal'
|
|
1450
1455
|
}, params.includePaymentStatus !== false ? {
|
|
1451
1456
|
payment_status: tempOrder.payment_status || 'payment_processing'
|
|
@@ -1473,13 +1478,13 @@ export function buildSubmitPayload(params) {
|
|
|
1473
1478
|
// holder: tempOrder.holder || null,
|
|
1474
1479
|
summary: summary || tempOrder.summary || createEmptySummary(),
|
|
1475
1480
|
metadata: function () {
|
|
1476
|
-
var
|
|
1477
|
-
_collectPax =
|
|
1478
|
-
_tableOccupancyDuration =
|
|
1479
|
-
_cartSettlementKey =
|
|
1480
|
-
_cartSettlementSnapshot =
|
|
1481
|
-
_legalCurrencySnapshot =
|
|
1482
|
-
rest = _objectWithoutProperties(
|
|
1481
|
+
var _ref37 = tempOrder.metadata || {},
|
|
1482
|
+
_collectPax = _ref37.collect_pax,
|
|
1483
|
+
_tableOccupancyDuration = _ref37.table_occupancy_duration,
|
|
1484
|
+
_cartSettlementKey = _ref37.cart_settlement_key,
|
|
1485
|
+
_cartSettlementSnapshot = _ref37.cart_settlement_snapshot,
|
|
1486
|
+
_legalCurrencySnapshot = _ref37.legal_currency_snapshot,
|
|
1487
|
+
rest = _objectWithoutProperties(_ref37, _excluded5);
|
|
1483
1488
|
return _objectSpread({}, rest);
|
|
1484
1489
|
}()
|
|
1485
1490
|
}, (_tempOrder$_extend = tempOrder._extend) !== null && _tempOrder$_extend !== void 0 && (_tempOrder$_extend = _tempOrder$_extend.salesNotesState) !== null && _tempOrder$_extend !== void 0 && _tempOrder$_extend.dirty ? {
|
|
@@ -1683,9 +1688,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
|
|
|
1683
1688
|
* getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
|
|
1684
1689
|
*/
|
|
1685
1690
|
export function getOrderProductLineUid(product) {
|
|
1686
|
-
var _product$metadata$
|
|
1691
|
+
var _product$metadata$uni, _product$metadata7;
|
|
1687
1692
|
if (!product || _typeof(product) !== 'object') return null;
|
|
1688
|
-
var uid = (_product$metadata$
|
|
1693
|
+
var uid = (_product$metadata$uni = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
|
|
1689
1694
|
if (uid === undefined || uid === null || uid === '') return null;
|
|
1690
1695
|
return String(uid);
|
|
1691
1696
|
}
|
|
@@ -1696,8 +1701,8 @@ export function getRuntimeProductOrigin(tempOrder, product) {
|
|
|
1696
1701
|
return tempOrder._extend.productsByUid[uid].origin;
|
|
1697
1702
|
}
|
|
1698
1703
|
var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
|
|
1699
|
-
var
|
|
1700
|
-
return item === product || getOrderProductLineUid(item) === uid || String((
|
|
1704
|
+
var _ref38, _item$product_id, _ref39, _product$product_id;
|
|
1705
|
+
return item === product || getOrderProductLineUid(item) === uid || String((_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : '') === String((_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : '');
|
|
1701
1706
|
});
|
|
1702
1707
|
var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
|
|
1703
1708
|
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;
|