@pisell/pisellos 2.2.317 → 2.2.319
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/evaluator.js +5 -4
- package/dist/modules/Discount/types.d.ts +4 -0
- package/dist/modules/Order/index.d.ts +1 -1
- package/dist/modules/Order/index.js +27 -13
- package/dist/modules/Order/utils.js +45 -45
- package/dist/modules/Payment/walletpass.js +32 -6
- package/dist/modules/Rules/index.d.ts +3 -10
- package/dist/modules/Rules/index.js +169 -87
- package/dist/modules/Rules/promotionSelection.d.ts +14 -0
- package/dist/modules/Rules/promotionSelection.js +390 -0
- package/dist/modules/Rules/types.d.ts +9 -0
- package/dist/server/modules/order/index.d.ts +6 -0
- package/dist/server/modules/order/index.js +782 -447
- package/dist/solution/BaseSales/index.js +41 -21
- package/dist/solution/BaseSales/utils/cartPromotion.js +5 -2
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/lib/model/strategy/adapter/promotion/evaluator.js +5 -4
- package/lib/model/strategy/adapter/promotion/index.js +1 -46
- package/lib/modules/Discount/types.d.ts +4 -0
- package/lib/modules/Order/index.d.ts +1 -1
- package/lib/modules/Order/index.js +11 -0
- package/lib/modules/Order/utils.js +1 -1
- package/lib/modules/Payment/walletpass.js +23 -1
- package/lib/modules/Rules/index.d.ts +3 -10
- package/lib/modules/Rules/index.js +62 -22
- package/lib/modules/Rules/promotionSelection.d.ts +14 -0
- package/lib/modules/Rules/promotionSelection.js +230 -0
- package/lib/modules/Rules/types.d.ts +9 -0
- package/lib/server/modules/order/index.d.ts +6 -0
- package/lib/server/modules/order/index.js +226 -29
- package/lib/solution/BaseSales/index.js +19 -5
- package/lib/solution/BaseSales/utils/cartPromotion.js +5 -2
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/package.json +1 -1
|
@@ -27,6 +27,7 @@ var _pickupTiming2 = require("./pickupTiming");
|
|
|
27
27
|
var _fulfillmentItemRules = require("./fulfillmentItemRules");
|
|
28
28
|
var _holderRelations = require("../../modules/Order/holderRelations");
|
|
29
29
|
var _contactInfo = require("../../modules/OpenData/contactInfo");
|
|
30
|
+
var _promotionSelection = require("../../modules/Rules/promotionSelection");
|
|
30
31
|
var _decimal = _interopRequireDefault(require("decimal.js"));
|
|
31
32
|
var _lodashEs = require("lodash-es");
|
|
32
33
|
var _types2 = require("../BookingByStep/types");
|
|
@@ -2141,17 +2142,25 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
|
|
|
2141
2142
|
return {
|
|
2142
2143
|
...discount,
|
|
2143
2144
|
isSelected: false,
|
|
2144
|
-
isManualSelect: true
|
|
2145
|
+
isManualSelect: true,
|
|
2146
|
+
promotionSelection: currentDiscount.promotionSelection,
|
|
2147
|
+
promotionSelectionStrategyIds: currentDiscount.promotionSelectionStrategyIds
|
|
2145
2148
|
};
|
|
2146
2149
|
}
|
|
2147
2150
|
if (currentDiscount.isSelected) {
|
|
2148
2151
|
return {
|
|
2149
2152
|
...discount,
|
|
2150
2153
|
isSelected: true,
|
|
2151
|
-
isManualSelect: false
|
|
2154
|
+
isManualSelect: false,
|
|
2155
|
+
promotionSelection: currentDiscount.promotionSelection,
|
|
2156
|
+
promotionSelectionStrategyIds: currentDiscount.promotionSelectionStrategyIds
|
|
2152
2157
|
};
|
|
2153
2158
|
}
|
|
2154
|
-
return
|
|
2159
|
+
return currentDiscount.promotionSelection ? {
|
|
2160
|
+
...discount,
|
|
2161
|
+
promotionSelection: currentDiscount.promotionSelection,
|
|
2162
|
+
promotionSelectionStrategyIds: currentDiscount.promotionSelectionStrategyIds
|
|
2163
|
+
} : discount;
|
|
2155
2164
|
});
|
|
2156
2165
|
}
|
|
2157
2166
|
resolveDiscountConfigCustomerId(tempOrder) {
|
|
@@ -2348,6 +2357,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
|
|
|
2348
2357
|
}
|
|
2349
2358
|
async bestDiscount(cb) {
|
|
2350
2359
|
if (!this.store.order) throw new Error('order 模块未初始化');
|
|
2360
|
+
this.hasManualDiscountSelection = false;
|
|
2351
2361
|
const tempOrder = this.store.order.ensureTempOrder();
|
|
2352
2362
|
if (this.isActiveVirtualSettlementOrder(tempOrder)) {
|
|
2353
2363
|
const result = {
|
|
@@ -2512,8 +2522,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
|
|
|
2512
2522
|
nextDiscountList = result.discountList;
|
|
2513
2523
|
if (!params.isSelected) {
|
|
2514
2524
|
const beforeSelectedIds = new Set(updated.filter(d => d.isSelected).map(d => d.id));
|
|
2525
|
+
// Rules 已对促销组完成互斥报价,不能再移除其选中的卡而留下已取消的促销。
|
|
2526
|
+
const promotionCardIds = new Set((result.productList || []).filter(product => (0, _promotionSelection.getExclusivePromotion)(product)?.excludedByDiscountCard).flatMap(product => (product.discount_list || []).filter(_promotionSelection.isPromotionDiscountCard).map(discount => String(discount.discount?.resource_id ?? discount.id))));
|
|
2515
2527
|
for (const d of nextDiscountList) {
|
|
2516
|
-
if (d.isSelected && !beforeSelectedIds.has(d.id)) {
|
|
2528
|
+
if (d.isSelected && !beforeSelectedIds.has(d.id) && !promotionCardIds.has(String(d.id))) {
|
|
2517
2529
|
d.isSelected = false;
|
|
2518
2530
|
d.isManualSelect = true;
|
|
2519
2531
|
d.appliedProductDetails = [];
|
|
@@ -2524,6 +2536,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
|
|
|
2524
2536
|
}
|
|
2525
2537
|
const selectedResourceIds = new Set(nextDiscountList.filter(d => d.isSelected).map(d => d.id));
|
|
2526
2538
|
const filterSelectedDiscountDetails = discountList => (discountList || []).filter(pd => {
|
|
2539
|
+
// 互斥计算保留/恢复的系统促销没有钱包 resource_id,不能按已选卡列表移除。
|
|
2540
|
+
if (pd.type === 'promotion' || pd.type === 'product' && pd.metadata?.source === 'promotion') return true;
|
|
2527
2541
|
const rid = pd.discount?.resource_id ?? pd.id;
|
|
2528
2542
|
return rid != null && selectedResourceIds.has(rid);
|
|
2529
2543
|
});
|
|
@@ -2550,7 +2564,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
|
|
|
2550
2564
|
|
|
2551
2565
|
// 券作用于 source(不含 option、不含 bundle);算出新 source 折后价后补回 options
|
|
2552
2566
|
// 写入含 option 的 main_product_selling_price,再合成 composite 回写 selling_price。
|
|
2553
|
-
const totalPerUnitDiscount = (product.discount_list || []).reduce((sum, pd) => sum + (pd.amount || 0), 0);
|
|
2567
|
+
const totalPerUnitDiscount = (product.discount_list || []).reduce((sum, pd) => sum + Number(pd.amount || 0), 0);
|
|
2554
2568
|
// TODO 这块逻辑需要拿掉
|
|
2555
2569
|
const optionSum = (0, _utils.sumOptionUnitPrice)((0, _utils.getProductSkuOptions)(product));
|
|
2556
2570
|
const sourcePrice = product.metadata?.source_product_price ?? (product.metadata?.main_product_original_price != null ? new _decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? '0');
|
|
@@ -245,7 +245,10 @@ function resolveXItemsExpectedUnitPrice(promotion, sourceCartNum) {
|
|
|
245
245
|
const y = Number(detail?.price);
|
|
246
246
|
if (!Number.isFinite(x) || x <= 0 || !Number.isFinite(y)) return undefined;
|
|
247
247
|
if (sourceCartNum < x) return undefined;
|
|
248
|
-
|
|
248
|
+
const originalPrice = Number(promotion?.originalPrice);
|
|
249
|
+
const expectedUnit = new _decimal.default(y).div(x);
|
|
250
|
+
// 归并拆分行时沿用评估器的原价上限,避免重新按 Y / X 把原价抬高。
|
|
251
|
+
return (Number.isFinite(originalPrice) && originalPrice >= 0 ? _decimal.default.min(expectedUnit, originalPrice) : expectedUnit).toDecimalPlaces(2).toNumber();
|
|
249
252
|
}
|
|
250
253
|
|
|
251
254
|
/**
|
|
@@ -756,7 +759,7 @@ function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesR
|
|
|
756
759
|
for (let i = 0; i < processedProducts.length; i++) {
|
|
757
760
|
const product = processedProducts[i];
|
|
758
761
|
const promotion = product?.metadata?._promotion;
|
|
759
|
-
if (!promotion || promotion.inPromotion !== false) continue;
|
|
762
|
+
if (!promotion || promotion.inPromotion !== false || promotion.excludedByDiscountCard) continue;
|
|
760
763
|
const strategyId = promotion.strategyId;
|
|
761
764
|
if (!strategyId) continue;
|
|
762
765
|
const lookupUid = String(product?._originalProductUid ?? product?.metadata?.unique_identification_number ?? '');
|
|
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
328
328
|
date: string;
|
|
329
329
|
status: string;
|
|
330
330
|
week: string;
|
|
331
|
-
weekNum: 0 |
|
|
331
|
+
weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
|
|
332
332
|
}[]>;
|
|
333
333
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
334
334
|
private getScheduleDataByIds;
|