@pisell/pisellos 2.2.245 → 2.2.247
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +6 -3
- package/dist/modules/Order/index.d.ts +8 -1
- package/dist/modules/Order/index.js +485 -314
- package/dist/modules/Order/types.d.ts +1 -0
- package/dist/modules/Payment/walletpass.js +1 -1
- package/dist/server/modules/order/index.js +7 -3
- package/dist/server/utils/small-ticket.d.ts +1 -0
- package/dist/server/utils/small-ticket.js +81 -41
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/lib/model/strategy/adapter/promotion/index.js +0 -49
- package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js +5 -2
- package/lib/modules/Order/index.d.ts +8 -1
- package/lib/modules/Order/index.js +120 -10
- package/lib/modules/Order/types.d.ts +1 -0
- package/lib/modules/Payment/walletpass.js +1 -1
- package/lib/server/modules/order/index.js +7 -3
- package/lib/server/utils/small-ticket.d.ts +1 -0
- package/lib/server/utils/small-ticket.js +40 -3
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/package.json +1 -1
|
@@ -75,7 +75,7 @@ function mapOrderBundleToOtherBundle(bundle) {
|
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
export function buildNormalProductCacheItemFromOrderLine(input) {
|
|
78
|
-
var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _price3, _product$order_detail;
|
|
78
|
+
var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _price3, _product$order_detail;
|
|
79
79
|
var product = input.product,
|
|
80
80
|
sourceProduct = input.sourceProduct;
|
|
81
81
|
var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
|
|
@@ -112,7 +112,10 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
|
|
|
112
112
|
other: other,
|
|
113
113
|
skuValue: JSON.parse(JSON.stringify(skuValue)),
|
|
114
114
|
_skuValue: JSON.parse(JSON.stringify(skuValue)),
|
|
115
|
-
isNormalProduct: true
|
|
115
|
+
isNormalProduct: true,
|
|
116
|
+
metadata: {
|
|
117
|
+
product_add_schedule_time: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_add_schedule_time
|
|
118
|
+
}
|
|
116
119
|
}, productOptionString ? {
|
|
117
120
|
product_option_string: productOptionString
|
|
118
121
|
} : {}), (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined ? {
|
|
@@ -128,7 +131,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
|
|
|
128
131
|
id: resolvedId,
|
|
129
132
|
product_id: resolvedId,
|
|
130
133
|
_id: uid,
|
|
131
|
-
title: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title,
|
|
134
|
+
title: (_ref6 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref6 !== void 0 ? _ref6 : '',
|
|
132
135
|
price: (_price3 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price3 !== void 0 ? _price3 : sourcePrice,
|
|
133
136
|
selling_price: product.selling_price,
|
|
134
137
|
original_price: product.original_price
|
|
@@ -26,6 +26,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
26
26
|
private giftSelectResolver;
|
|
27
27
|
/** applyPromotion 递归保护 flag(写路径同步调 applyPromotion,禁止重入) */
|
|
28
28
|
private isApplyingPromotion;
|
|
29
|
+
/** 商品曾应用过客户券卡,客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
|
|
30
|
+
private hasActiveCustomerBoundDiscount;
|
|
29
31
|
/** 最近一次 applyPromotion 的未满足促销提示 */
|
|
30
32
|
private lastUnfulfilledPromotions;
|
|
31
33
|
/** 最近一次 applyPromotion 的赠品操作 diff(debug / SDK 读取使用) */
|
|
@@ -179,6 +181,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
179
181
|
private buildOrderProductsFingerprint;
|
|
180
182
|
private buildProductStructuralFingerprintItem;
|
|
181
183
|
private buildOrderProductsStructuralFingerprint;
|
|
184
|
+
private getManualDepositOverride;
|
|
185
|
+
private setManualDepositOverride;
|
|
186
|
+
private clearManualDepositOverride;
|
|
182
187
|
private getOriginalSalesSnapshot;
|
|
183
188
|
private isSnapshotPayableAmountUnchanged;
|
|
184
189
|
private restoreOriginalSnapshotIfProductsUnchanged;
|
|
@@ -255,6 +260,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
255
260
|
updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
|
|
256
261
|
private buildTempOrderCustomer;
|
|
257
262
|
private isCustomerBoundDiscount;
|
|
263
|
+
private productHasCustomerBoundDiscount;
|
|
264
|
+
private shouldSkipDiscountCalculation;
|
|
258
265
|
private clearCustomerBoundDiscounts;
|
|
259
266
|
/**
|
|
260
267
|
* 更新当前 tempOrder 的客户协议字段。
|
|
@@ -422,7 +429,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
422
429
|
generateIdempotencyToken(): string;
|
|
423
430
|
syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
|
|
424
431
|
createOrder(params: CommitOrderParams['query']): {
|
|
425
|
-
type: "
|
|
432
|
+
type: "virtual" | "appointment_booking";
|
|
426
433
|
platform: string;
|
|
427
434
|
sales_channel: string;
|
|
428
435
|
order_sales_channel: string;
|