@pisell/pisellos 2.1.170 → 2.1.172

package/dist/solution/ShopDiscount/index.js

@@ -57,7 +57,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: undefined,
-      orderId: undefined
+      orderTotalAmount: 0
     };
     return _this;
   }
@@ -289,7 +289,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }() // 设置holders
+    }()
+  }, {
+    key: "setOriginTotalAmount",
+    value: function setOriginTotalAmount(amount) {
+      this.store.orderTotalAmount = amount;
+    }
+
+    // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -300,11 +307,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setBookingSubject(bookingSubject) {
       this.store.bookingSubject = bookingSubject;
     }
-  }, {
-    key: "setOrderId",
-    value: function setOrderId(id) {
-      this.store.orderId = id;
-    }
 
     // 计算优惠券
   }, {
@@ -322,6 +324,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
+          orderTotalAmount: this.store.orderTotalAmount || 0,
           holders: this.store.holders || [],
           isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
@@ -434,32 +437,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
-        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        var _this$store$discount4, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.prev = 0;
               _context6.next = 3;
-              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, {
-                customerId: customerId,
-                orderId: this.store.orderId
-              });
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, customerId);
             case 3:
               _context6.t0 = _context6.sent;
               if (_context6.t0) {
                 _context6.next = 6;
                 break;
               }
-              _context6.t0 = {
-                discountList: [],
-                unavailableReasonKey: null
-              };
+              _context6.t0 = [];
             case 6:
-              resultDiscountWithReason = _context6.t0;
-              resultDiscountList = resultDiscountWithReason.discountList, unavailableReasonKey = resultDiscountWithReason.unavailableReasonKey;
+              resultDiscountList = _context6.t0;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context6.next = 11;
+                _context6.next = 10;
                 break;
               }
               return _context6.abrupt("return", {
@@ -469,19 +465,18 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 11:
+            case 10:
               if (resultDiscountList.length) {
-                _context6.next = 13;
+                _context6.next = 12;
                 break;
               }
               return _context6.abrupt("return", {
                 type: "server",
                 isAvailable: false,
                 productList: this.store.productList || [],
-                discountList: this.getDiscountList(),
-                unavailableReasonKey: unavailableReasonKey
+                discountList: this.getDiscountList()
               });
-            case 13:
+            case 12:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -495,7 +490,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context6.next = 17;
+                _context6.next = 16;
                 break;
               }
               return _context6.abrupt("return", {
@@ -504,11 +499,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 17:
+            case 16:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
+                orderTotalAmount: this.store.orderTotalAmount || 0,
                 holders: this.store.holders || [],
                 isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
@@ -517,19 +513,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
               if (!isAvailable) {
-                _context6.next = 25;
+                _context6.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context6.next = 25;
+                _context6.next = 24;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 25:
+            case 24:
               return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
@@ -537,8 +533,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: newDiscountList || this.getDiscountList(),
                 unavailableReason: unavailableReason
               });
-            case 28:
-              _context6.prev = 28;
+            case 27:
+              _context6.prev = 27;
               _context6.t1 = _context6["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context6.t1);
               return _context6.abrupt("return", {
@@ -548,11 +544,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 32:
+            case 31:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 28]]);
+        }, _callee6, this, [[0, 27]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
@@ -622,21 +618,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
-                var _discount$metadata;
+                var _editModeDiscountList, _discount$metadata, _discount$metadata2;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((editModeDiscountList === null || editModeDiscountList === void 0 || (_editModeDiscountList = editModeDiscountList[index]) === null || _editModeDiscountList === void 0 || (_editModeDiscountList = _editModeDiscountList.metadata) === null || _editModeDiscountList === void 0 ? void 0 : _editModeDiscountList.num) || 1) + (((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || 1)
+                  }),
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata3, _discount$metadata4, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                  metadata: _objectSpread(_objectSpread({}, discount.metadata || {}), {}, {
+                    num: ((_discount$metadata3 = discount.metadata) === null || _discount$metadata3 === void 0 ? void 0 : _discount$metadata3.num) || 1
+                  }),
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.product_discount_difference) || 0).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.quantity) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus((discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.product_discount_difference) || 0).toNumber(),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -783,69 +785,65 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfig, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _context10.prev = 0;
-              orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context10.next = 5;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
+              _context10.next = 4;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
                 customer_id: customerId,
-                action: orderId ? 'edit' : 'create',
+                action: 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              }, orderId ? {
-                order_id: orderId
-              } : {}));
-            case 5:
-              prepareConfig = _context10.sent;
-              goodPassList = (prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.discountList) || [];
+              });
+            case 4:
+              goodPassList = _context10.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
               scanDiscountIds = scanDiscount.map(function (n) {
                 return n.id;
               });
-              newGoodPassList = goodPassList.filter(function (n) {
+              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
                 return !scanDiscountIds.includes(n.id);
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 14;
+              _context10.next = 12;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 14:
+            case 12:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 21;
+                _context10.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 21;
+              _context10.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
+            case 19:
+              _context10.next = 21;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 21:
-              _context10.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 23:
-              _context10.next = 28;
+              _context10.next = 26;
               break;
-            case 25:
-              _context10.prev = 25;
+            case 23:
+              _context10.prev = 23;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 28:
+            case 26:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 25]]);
+        }, _callee10, this, [[0, 23]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -23,6 +23,7 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    orderTotalAmount?: number;
     holders?: {
         form_record_id: number;
         form_id?: number;
@@ -35,7 +36,6 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
-    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/dist/solution/ShopDiscount/types.js

@@ -8,4 +8,5 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";
   return ShopDiscountHooks;
-}({});
+}({});
+;

package/dist/solution/ShopDiscount/utils.js

@@ -40,23 +40,37 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
  * @returns 
  */
 export var getDiscountAmount = function getDiscountAmount(discount, total, price) {
-  var _discount$metadata;
+  var discountedPrice = 0;
+
   // 商品券
   if (discount.tag === 'good_pass') {
-    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
+    discountedPrice = new Decimal(price).minus(new Decimal(price || 0)).toNumber();
+  } else {
+    var _discount$metadata;
+    // 判断是否是固定金额
+    var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
+
+    // 固定金额 小于0时返回0
+    if (isFixedAmount) {
+      discountedPrice = Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+    } else {
+      // 百分比：根据折扣卡金额计算
+      discountedPrice = new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+    }
   }
 
-  // 判断是否是固定金额
-  var isFixedAmount = (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.discount_card_type) === 'fixed_amount';
-
-  // 固定金额 小于0时返回0
-  if (isFixedAmount) {
-    var _discount$amount;
-    return Math.max(new Decimal(price).minus(new Decimal(((_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.par_value) || 0)).toNumber(), 0);
-  }
+  /*
+    // 🔥 如果有 maxDeductionAmount 限制，确保折扣金额不超过限制
+    if (discount.config?.maxDeductionAmount) {
+      const actualDiscountAmount = new Decimal(price).minus(discountedPrice).toNumber();
+      if (actualDiscountAmount > discount.config.maxDeductionAmount) {
+        // 折扣金额超过限制，重新计算折扣后价格
+        discountedPrice = new Decimal(price).minus(discount.config.maxDeductionAmount).toNumber();
+      }
+    }
+  */
 
-  // 百分比：根据折扣卡金额计算
-  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+  return discountedPrice;
 };
 export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
   return discount.reduce(function (acc, cur) {

package/dist/solution/index.d.ts

@@ -4,5 +4,3 @@ export * from './BookingTicket';
 export * from './ShopDiscount';
 export * from './RegisterAndLogin';
 export * from './Checkout';
-export * from './ScanOrder';
-export * from './VenueBooking';

package/dist/solution/index.js

@@ -3,6 +3,4 @@ export * from "./BookingByStep";
 export * from "./BookingTicket";
 export * from "./ShopDiscount";
 export * from "./RegisterAndLogin";
-export * from "./Checkout";
-export * from "./ScanOrder";
-export * from "./VenueBooking";
+export * from "./Checkout";

package/lib/index.d.ts

@@ -6,7 +6,7 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
+export * from './model';
 export { PisellOSCore } from './core';
-export { DataVariantEvaluator } from './model/strategy/adapter/dataVariant/evaluator';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/lib/index.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  DataVariantEvaluator: () => import_evaluator.DataVariantEvaluator,
   PisellOSCore: () => import_core.PisellOSCore,
   default: () => src_default
 });
@@ -39,16 +38,16 @@ __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./modules"), module.exports);
 __reExport(src_exports, require("./plugins"), module.exports);
 __reExport(src_exports, require("./solution"), module.exports);
+__reExport(src_exports, require("./model"), module.exports);
 var import_core = require("./core");
-var import_evaluator = require("./model/strategy/adapter/dataVariant/evaluator");
 var import_core2 = __toESM(require("./core"));
 var src_default = import_core2.default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DataVariantEvaluator,
   PisellOSCore,
   ...require("./types"),
   ...require("./modules"),
   ...require("./plugins"),
-  ...require("./solution")
+  ...require("./solution"),
+  ...require("./model")
 });

package/lib/model/strategy/adapter/index.d.ts

@@ -5,7 +5,3 @@ export { PromotionEvaluator } from './promotion/evaluator';
 export { PromotionAdapter } from './promotion/adapter';
 export { ItemRuleEvaluator } from './itemRule/evaluator';
 export { ItemRuleAdapter } from './itemRule/adapter';
-export { DataVariantEvaluator } from './dataVariant/evaluator';
-export { DataVariantAdapter } from './dataVariant/adapter';
-export { runDataVariantDemo } from './dataVariant/examples';
-export * from './dataVariant/type';

package/lib/model/strategy/adapter/index.js

@@ -30,15 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/model/strategy/adapter/index.ts
 var adapter_exports = {};
 __export(adapter_exports, {
-  DataVariantAdapter: () => import_adapter3.DataVariantAdapter,
-  DataVariantEvaluator: () => import_evaluator4.DataVariantEvaluator,
   ItemRuleAdapter: () => import_adapter2.ItemRuleAdapter,
   ItemRuleEvaluator: () => import_evaluator3.ItemRuleEvaluator,
   PromotionAdapter: () => import_adapter.PromotionAdapter,
   PromotionEvaluator: () => import_evaluator2.PromotionEvaluator,
   WalletPassAdapter: () => import_walletPass.default,
-  WalletPassEvaluator: () => import_evaluator.WalletPassEvaluator,
-  runDataVariantDemo: () => import_examples.runDataVariantDemo
+  WalletPassEvaluator: () => import_evaluator.WalletPassEvaluator
 });
 module.exports = __toCommonJS(adapter_exports);
 __reExport(adapter_exports, require("./type"), module.exports);
@@ -48,21 +45,13 @@ var import_evaluator2 = require("./promotion/evaluator");
 var import_adapter = require("./promotion/adapter");
 var import_evaluator3 = require("./itemRule/evaluator");
 var import_adapter2 = require("./itemRule/adapter");
-var import_evaluator4 = require("./dataVariant/evaluator");
-var import_adapter3 = require("./dataVariant/adapter");
-var import_examples = require("./dataVariant/examples");
-__reExport(adapter_exports, require("./dataVariant/type"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DataVariantAdapter,
-  DataVariantEvaluator,
   ItemRuleAdapter,
   ItemRuleEvaluator,
   PromotionAdapter,
   PromotionEvaluator,
   WalletPassAdapter,
   WalletPassEvaluator,
-  runDataVariantDemo,
-  ...require("./type"),
-  ...require("./dataVariant/type")
+  ...require("./type")
 });

package/lib/model/strategy/adapter/promotion/evaluator.js

@@ -512,14 +512,21 @@ var PromotionEvaluator = class {
         unitProducts.push({
           product,
           price: product.price,
-          productId: product.id
+          productId: product.id,
+          sourceAvailableQty: availableQty
         });
       }
     }
     if (unitProducts.length === 0) {
       return { products: [], originalAmount: 0, finalAmount: 0 };
     }
-    unitProducts.sort((a, b) => b.price - a.price);
+    unitProducts.sort((a, b) => {
+      const aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
+      const bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
+      if (aIsMultiple !== bIsMultiple)
+        return bIsMultiple - aIsMultiple;
+      return b.price - a.price;
+    });
     const totalUnits = unitProducts.length;
     const groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
     const promotionUnits = groupCount * x;
@@ -573,7 +580,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, productOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           quantity: promoQty,
@@ -584,9 +593,8 @@ var PromotionEvaluator = class {
           isSplit: false,
           matchedBundleIndex
         });
-        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(productOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
       } else if (promoQty === 0 && remainingQty > 0) {
         result.push({
           ...product,
@@ -605,7 +613,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, promoOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           id: this.generateRandomId(),
@@ -618,9 +628,8 @@ var PromotionEvaluator = class {
           matchedBundleIndex,
           isSplit: true
         });
-        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(promoOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
         result.push({
           ...product,
           quantity: remainingQty,
@@ -636,6 +645,46 @@ var PromotionEvaluator = class {
       }
       processedQuantityMap.set(key, processedQty + availableQty);
     }
+    if (groupCount > 0) {
+      const expectedPromoTotal = new import_decimal.default(groupPrice).mul(groupCount);
+      const promoItems = result.filter((p) => p.inPromotion);
+      let actualPromoTotal = new import_decimal.default(0);
+      for (const p of promoItems) {
+        actualPromoTotal = actualPromoTotal.plus(
+          new import_decimal.default(p.finalPrice).mul(p.quantity)
+        );
+      }
+      const roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
+      if (!roundingDiff.eq(0)) {
+        const adjustTarget = promoItems.find((p) => p.quantity === 1);
+        if (adjustTarget) {
+          adjustTarget.finalPrice = this.formatPrice(
+            new import_decimal.default(adjustTarget.finalPrice).minus(roundingDiff)
+          );
+        } else if (promoItems.length > 0) {
+          const lastPromo = promoItems[promoItems.length - 1];
+          const adjustedUnitPrice = this.formatPrice(
+            new import_decimal.default(lastPromo.finalPrice).minus(roundingDiff)
+          );
+          lastPromo.quantity -= 1;
+          lastPromo.isSplit = true;
+          result.push({
+            ...lastPromo,
+            id: this.generateRandomId(),
+            originalId: lastPromo.originalId || lastPromo.id,
+            quantity: 1,
+            finalPrice: adjustedUnitPrice,
+            isSplit: true
+          });
+        }
+        finalAmount = new import_decimal.default(0);
+        for (const p of result) {
+          finalAmount = finalAmount.plus(
+            new import_decimal.default(p.finalPrice).mul(p.quantity)
+          );
+        }
+      }
+    }
     return {
       products: result,
       originalAmount: originalAmount.toNumber(),

package/lib/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -8,10 +8,12 @@ export declare class WalletPassEvaluator {
     private engine;
     private strategyConfigs;
     private locale;
+    private otherParams;
     constructor();
     setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
     getStrategyConfigs(): StrategyConfig[];
     setLocale(locale: string): void;
+    setOtherParams(otherParams: any): void;
     getText(key: string): string;
     /**
      * 搜索券的格式