@pisell/pisellos 2.3.170 → 2.3.171
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/model/strategy/adapter/promotion/index.js +9 -0
- package/dist/modules/Discount/types.d.ts +4 -0
- package/dist/modules/Order/index.js +27 -13
- package/dist/modules/Product/index.d.ts +1 -1
- 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 +2 -2
- 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.js +11 -0
- package/lib/modules/Product/index.d.ts +1 -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 +2 -2
- package/package.json +1 -1
|
@@ -792,6 +792,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
|
|
|
792
792
|
_iterator11.f();
|
|
793
793
|
}
|
|
794
794
|
var allocatedPricesByProductId = new Map();
|
|
795
|
+
var expectedPromoTotal = new Decimal(0);
|
|
795
796
|
for (var g = 0; g < groupCount; g++) {
|
|
796
797
|
var startIdx = g * x;
|
|
797
798
|
var endIdx = startIdx + x;
|
|
@@ -802,8 +803,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
|
|
|
802
803
|
return sum.plus(u.price);
|
|
803
804
|
}, new Decimal(0));
|
|
804
805
|
|
|
805
|
-
//
|
|
806
|
-
var groupPriceDecimal = new Decimal(groupPrice);
|
|
806
|
+
// 组价高于本组原价时保留原价,尾差目标也必须使用封顶后的实际组价。
|
|
807
|
+
var groupPriceDecimal = Decimal.min(new Decimal(groupPrice), groupOriginalTotal);
|
|
808
|
+
expectedPromoTotal = expectedPromoTotal.plus(groupPriceDecimal);
|
|
807
809
|
var allocatedSum = new Decimal(0);
|
|
808
810
|
for (var i = 0; i < groupUnits.length; i++) {
|
|
809
811
|
var unit = groupUnits[i];
|
|
@@ -911,14 +913,13 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
|
|
|
911
913
|
processedQuantityMap.set(_key, _processedQty + _availableQty);
|
|
912
914
|
}
|
|
913
915
|
|
|
914
|
-
// 8.
|
|
916
|
+
// 8. 尾差调整:只补实际组价的舍入差额,不将高于原价的组价补到某一件。
|
|
915
917
|
} catch (err) {
|
|
916
918
|
_iterator12.e(err);
|
|
917
919
|
} finally {
|
|
918
920
|
_iterator12.f();
|
|
919
921
|
}
|
|
920
922
|
if (groupCount > 0) {
|
|
921
|
-
var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
|
|
922
923
|
var promoItems = result.filter(function (p) {
|
|
923
924
|
return p.inPromotion;
|
|
924
925
|
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// 导出评估器
|
|
2
|
+
export { PromotionEvaluator } from "./evaluator";
|
|
3
|
+
|
|
4
|
+
// 导出适配器
|
|
5
|
+
export { PromotionAdapter } from "./adapter";
|
|
6
|
+
export { default } from "./adapter";
|
|
7
|
+
|
|
8
|
+
// 导出策略配置示例常量
|
|
9
|
+
export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";
|
|
@@ -158,6 +158,10 @@ export interface Discount {
|
|
|
158
158
|
discount_calculation_mode: 'item_level' | 'order_level';
|
|
159
159
|
};
|
|
160
160
|
isManualSelect?: boolean;
|
|
161
|
+
/** X 件 Y 元互斥选择的手动意图;isSelected 只表示本次实际应用结果。 */
|
|
162
|
+
promotionSelection?: 'card' | 'promotion';
|
|
163
|
+
/** 记录手动操作影响的促销组,避免卡失效后普通重算丢失取消意图。 */
|
|
164
|
+
promotionSelectionStrategyIds?: string[];
|
|
161
165
|
isDisabled?: boolean;
|
|
162
166
|
isSelected?: boolean;
|
|
163
167
|
isAvailable?: boolean;
|
|
@@ -676,7 +676,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
676
676
|
_this$store$discount,
|
|
677
677
|
_this4 = this,
|
|
678
678
|
_this$store$tempOrder2;
|
|
679
|
-
var orderId, requestEpoch, requestOrderIdentityKey, prepareConfigResult, isCurrentRequest, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
|
|
679
|
+
var orderId, requestEpoch, requestOrderIdentityKey, prepareConfigResult, isCurrentRequest, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentDiscountList, currentPromotionSelections, currentCommittedDiscounts, currentScanDiscounts, currentScanDiscountById, committedDiscountById, mergedCommittedDiscountIds, refreshedScanDiscountIds, runtimeDiscountIds, runtimeDiscounts, retainedCommittedDiscounts, retainedScanDiscounts, mergedDiscountList;
|
|
680
680
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
681
681
|
while (1) switch (_context3.prev = _context3.next) {
|
|
682
682
|
case 0:
|
|
@@ -721,10 +721,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
721
721
|
});
|
|
722
722
|
}
|
|
723
723
|
if (!discountList) {
|
|
724
|
-
_context3.next =
|
|
724
|
+
_context3.next = 33;
|
|
725
725
|
break;
|
|
726
726
|
}
|
|
727
727
|
currentDiscountList = ((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || [];
|
|
728
|
+
currentPromotionSelections = new Map(currentDiscountList.filter(function (discount) {
|
|
729
|
+
return !discount.isEditMode && discount.promotionSelection;
|
|
730
|
+
}).map(function (discount) {
|
|
731
|
+
return [String(discount.id), discount];
|
|
732
|
+
}));
|
|
728
733
|
currentCommittedDiscounts = currentDiscountList.filter(function (discount) {
|
|
729
734
|
var _discount$committedAp;
|
|
730
735
|
return (discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 || (_discount$committedAp = discount.committedAppliedProductDetails) === null || _discount$committedAp === void 0 ? void 0 : _discount$committedAp.length);
|
|
@@ -767,6 +772,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
767
772
|
isManualSelect: (_currentScanDiscount$2 = currentScanDiscount.isManualSelect) !== null && _currentScanDiscount$2 !== void 0 ? _currentScanDiscount$2 : nextDiscount.isManualSelect
|
|
768
773
|
});
|
|
769
774
|
}
|
|
775
|
+
var currentSelection = currentPromotionSelections.get(String(discount.id));
|
|
776
|
+
if (currentSelection) {
|
|
777
|
+
nextDiscount = _objectSpread(_objectSpread({}, nextDiscount), {}, {
|
|
778
|
+
promotionSelection: currentSelection.promotionSelection,
|
|
779
|
+
promotionSelectionStrategyIds: currentSelection.promotionSelectionStrategyIds,
|
|
780
|
+
isManualSelect: currentSelection.isManualSelect,
|
|
781
|
+
isSelected: currentSelection.isSelected
|
|
782
|
+
});
|
|
783
|
+
}
|
|
770
784
|
return [nextDiscount];
|
|
771
785
|
});
|
|
772
786
|
retainedCommittedDiscounts = currentCommittedDiscounts.filter(function (discount) {
|
|
@@ -788,34 +802,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
788
802
|
});
|
|
789
803
|
mergedDiscountList = [].concat(_toConsumableArray(retainedCommittedDiscounts), _toConsumableArray(retainedScanDiscounts), _toConsumableArray(runtimeDiscounts));
|
|
790
804
|
if (isCurrentRequest()) {
|
|
791
|
-
_context3.next =
|
|
805
|
+
_context3.next = 27;
|
|
792
806
|
break;
|
|
793
807
|
}
|
|
794
808
|
return _context3.abrupt("return", this.getDiscountList());
|
|
795
|
-
case
|
|
796
|
-
_context3.next =
|
|
809
|
+
case 27:
|
|
810
|
+
_context3.next = 29;
|
|
797
811
|
return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
|
|
798
|
-
case
|
|
812
|
+
case 29:
|
|
799
813
|
if (isCurrentRequest()) {
|
|
800
|
-
_context3.next =
|
|
814
|
+
_context3.next = 31;
|
|
801
815
|
break;
|
|
802
816
|
}
|
|
803
817
|
return _context3.abrupt("return", this.getDiscountList());
|
|
804
|
-
case
|
|
805
|
-
_context3.next =
|
|
818
|
+
case 31:
|
|
819
|
+
_context3.next = 33;
|
|
806
820
|
return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
|
|
807
|
-
case
|
|
821
|
+
case 33:
|
|
808
822
|
if (isCurrentRequest()) {
|
|
809
|
-
_context3.next =
|
|
823
|
+
_context3.next = 35;
|
|
810
824
|
break;
|
|
811
825
|
}
|
|
812
826
|
return _context3.abrupt("return", this.getDiscountList());
|
|
813
|
-
case
|
|
827
|
+
case 35:
|
|
814
828
|
if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
|
|
815
829
|
this.applyDiscount();
|
|
816
830
|
}
|
|
817
831
|
return _context3.abrupt("return", this.getDiscountList());
|
|
818
|
-
case
|
|
832
|
+
case 37:
|
|
819
833
|
case "end":
|
|
820
834
|
return _context3.stop();
|
|
821
835
|
}
|
|
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
|
|
|
49
49
|
getCategories(): ProductCategory[];
|
|
50
50
|
setOtherParams(key: string, value: any): void;
|
|
51
51
|
getOtherParams(): any;
|
|
52
|
-
getProductType(): "
|
|
52
|
+
getProductType(): "duration" | "normal" | "session";
|
|
53
53
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Module, PisellCore, ModuleOptions } from '../../types';
|
|
2
2
|
import { BaseModule } from '../BaseModule';
|
|
3
|
-
import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, UnavailableReason } from './types';
|
|
3
|
+
import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, RulesCalcDiscountOptions, RulesCalcDiscountParams, UnavailableReason } from './types';
|
|
4
4
|
import { Discount } from '../Discount/types';
|
|
5
5
|
import { WindowPlugin } from '../../plugins';
|
|
6
6
|
export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
|
|
@@ -44,15 +44,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
|
|
|
44
44
|
resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
|
|
45
45
|
private isItemRewardProductDiscount;
|
|
46
46
|
private getUnavailableReason;
|
|
47
|
-
calcDiscount(
|
|
48
|
-
|
|
49
|
-
productList: any[];
|
|
50
|
-
holders: {
|
|
51
|
-
form_record_id: number;
|
|
52
|
-
}[];
|
|
53
|
-
isFormSubject: RulesFormSubject;
|
|
54
|
-
orderTotalAmount: number;
|
|
55
|
-
}, options?: RulesCalcDiscountOptions): DiscountResult;
|
|
47
|
+
calcDiscount(params: RulesCalcDiscountParams, options?: RulesCalcDiscountOptions): DiscountResult;
|
|
48
|
+
private calcDiscountCore;
|
|
56
49
|
/**
|
|
57
50
|
* 检查优惠是否符合 PackageSubItemUsageRules 配置
|
|
58
51
|
* @param discount 优惠券
|