@pisell/pisellos 2.1.149 → 2.1.151

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -14,8 +14,6 @@ export interface BookingByStepState {
     currentProduct?: ProductData;
     currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
-    salesSummary?: SalesSummaryModule;
-    scanOrderLogger?: ScanOrderLoggerModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,12 +1,10 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, ScheduleModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
       return new CartModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'summary':
       return new SummaryModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case 'salesSummary':
-      return new SalesSummaryModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'step':
       return new StepModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'products':
@@ -21,8 +19,6 @@ export function createModule(moduleName, solutionName, name, version) {
       return new PaymentModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'schedule':
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
-    case 'scanOrderLogger':
-      return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,12 +19,10 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
-    targetDate?: string | Dayjs;
-    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -91,14 +91,8 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
-    targetDate = _ref2.targetDate,
-    _ref2$durationMinutes = _ref2.durationMinutes,
-    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
   var currentTime = dayjs();
-  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
-  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
-  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -114,18 +108,17 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源在目标日期且还在工作时间内的时间段
-      var targetDayTimes = _resource.times.filter(function (time) {
-        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
-        if (!isSameTargetDay) return false;
-        if (!isTargetDayToday) return true;
-        return dayjs(time.end_at).isAfter(currentTime);
+      // 获取资源当天且还在工作时间内的时间段
+      var todayTimes = _resource.times.filter(function (time) {
+        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
+        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
+        return isToday && isStillWorking;
       });
-      if (targetDayTimes.length === 0) {
+      if (todayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
+      var _iterator4 = _createForOfIteratorHelper(todayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -135,7 +128,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
+            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -172,7 +165,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
                   // 单人预约资源：检查时间冲突
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
                     // 有冲突，使用事件结束时间
                     finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -184,7 +177,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -201,7 +194,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
+            if (finalAvailableTime.isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

package/dist/solution/Checkout/index.js

@@ -403,6 +403,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             product_id: item.product_id,
             product_variant_id: item.product_variant_id,
             quantity: item.num,
+            is_price_include_tax: item.is_price_include_tax,
             // 商品是否含税：1；0
             is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -427,6 +428,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: (item.product_bundle || []).map(function (bundle) {
               return {
+                is_price_include_tax: item.is_price_include_tax,
                 bundle_id: bundle.bundle_id,
                 bundle_product_id: bundle.bundle_product_id,
                 bundle_variant_id: bundle.bundle_variant_id,

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

@@ -22,6 +22,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
+    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/dist/solution/ShopDiscount/index.js

@@ -56,7 +56,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: undefined
+      bookingSubject: undefined,
+      orderTotalAmount: 0
     };
     return _this;
   }
@@ -288,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) {
@@ -316,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) || {
@@ -495,6 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 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'
               }) || {
@@ -608,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,
@@ -815,7 +831,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 19:
               _context10.next = 21;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 21:
               _context10.next = 26;
               break;

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;

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,6 +6,7 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
+export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/lib/index.js

@@ -38,6 +38,7 @@ __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_core2 = __toESM(require("./core"));
 var src_default = import_core2.default;
@@ -47,5 +48,6 @@ var src_default = import_core2.default;
   ...require("./types"),
   ...require("./modules"),
   ...require("./plugins"),
-  ...require("./solution")
+  ...require("./solution"),
+  ...require("./model")
 });

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;
     /**
      * 搜索券的格式

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

@@ -45,10 +45,27 @@ var defaultStrategyMetadataCustom = {
   maxPassesPerItem: 0,
   deductOptionPrice: false
 };
+var FIELD_REASON_CODE_MAP = {
+  orderTotalAmount: "order_total_amount_not_enough",
+  applicableProductTotalAmount: "applicable_product_total_amount_not_enough",
+  applicableProductCount: "applicable_product_count_not_enough"
+};
+var AMOUNT_FIELDS = /* @__PURE__ */ new Set([
+  "orderTotalAmount",
+  "applicableProductTotalAmount"
+]);
+function formatReason(template, value, currency = "") {
+  if (!template)
+    return template;
+  const v = value === void 0 || value === null ? "" : String(value);
+  const c = currency === void 0 || currency === null ? "" : String(currency);
+  return template.replace(/\$\{value\}/g, () => v).replace(/\{value\}/g, () => v).replace(/\{currency\}/g, () => c);
+}
 var WalletPassEvaluator = class {
   constructor() {
     this.strategyConfigs = [];
     this.locale = "en";
+    this.otherParams = {};
     this.engine = new import__.StrategyEngine({
       debug: false,
       enableTrace: false
@@ -64,6 +81,9 @@ var WalletPassEvaluator = class {
   setLocale(locale) {
     this.locale = locale;
   }
+  setOtherParams(otherParams) {
+    this.otherParams = otherParams;
+  }
   getText(key) {
     var _a, _b;
     return (_b = (_a = import_locales.locales) == null ? void 0 : _a[this.locale]) == null ? void 0 : _b[key];
@@ -101,7 +121,7 @@ var WalletPassEvaluator = class {
    * 评估可用的 vouchers
    */
   evaluate(input) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { orderTotalAmount, products, vouchers, strategyConfigs } = input;
     const productIds = products.map((p) => p.product_id);
     const results = [];
@@ -176,7 +196,13 @@ var WalletPassEvaluator = class {
         });
       } else {
         let reasonCode = "not_meet_the_required_conditions";
-        if (evaluationResult.code) {
+        let thresholdValue = void 0;
+        const failedField = (_c = evaluationResult.matched) == null ? void 0 : _c.failedField;
+        const failedRule = (_e = (_d = evaluationResult.matched) == null ? void 0 : _d.failedRules) == null ? void 0 : _e[0];
+        if (failedField && FIELD_REASON_CODE_MAP[failedField]) {
+          reasonCode = FIELD_REASON_CODE_MAP[failedField];
+          thresholdValue = failedRule == null ? void 0 : failedRule.value;
+        } else if (evaluationResult.code) {
           const codeMapping = {
             INSUFFICIENT_AMOUNT: "not_meet_the_required_conditions",
             USAGE_LIMIT_EXCEEDED: "usage_limit_reached",
@@ -186,6 +212,10 @@ var WalletPassEvaluator = class {
           };
           reasonCode = codeMapping[evaluationResult.code] || "not_meet_the_required_conditions";
         }
+        const rawText = this.getText(reasonCode);
+        const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
+        console.log(currency, "currency12345");
+        const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,
           isApplicable: false,
@@ -193,7 +223,7 @@ var WalletPassEvaluator = class {
           maxDeduction: 0,
           deductTaxAndFee: false,
           applicableProductIds: [],
-          reason: this.getText(reasonCode),
+          reason,
           reasonCode,
           strategyResult: evaluationResult
         });
@@ -386,6 +416,7 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
+    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/locales.js

@@ -29,7 +29,10 @@ var locales = {
     "usage_limit_reached": "已达到使用次数上限",
     "max_passes_per_item_reached": "该商品已达到卡券使用上限",
     "not_available_for_this_channel": "当前渠道不可使用",
-    "not_valid_for_this_order_type": "当前订单类型不适用"
+    "not_valid_for_this_order_type": "当前订单类型不适用",
+    "order_total_amount_not_enough": "满 {currency}{value} 可用",
+    "applicable_product_total_amount_not_enough": "满 {currency}{value} 可用",
+    "applicable_product_count_not_enough": "至少 {value} 件"
   },
   "en": {
     "not_meet_the_required_conditions": "Not meet the required conditions.",
@@ -37,7 +40,10 @@ var locales = {
     "usage_limit_reached": "Usage limit reached.",
     "max_passes_per_item_reached": "Max passes per item reached.",
     "not_available_for_this_channel": "Not available for this channel.",
-    "not_valid_for_this_order_type": "Not valid for this order type."
+    "not_valid_for_this_order_type": "Not valid for this order type.",
+    "order_total_amount_not_enough": "Spend {currency}{value} to use",
+    "applicable_product_total_amount_not_enough": "Spend {currency}{value} to use",
+    "applicable_product_count_not_enough": "Min. Qty {value}"
   },
   "zh-HK": {
     "not_meet_the_required_conditions": "未達使用條件",
@@ -45,7 +51,10 @@ var locales = {
     "usage_limit_reached": "已達使用次數上限",
     "max_passes_per_item_reached": "該商品已達卡券使用上限",
     "not_available_for_this_channel": "當前渠道不可使用",
-    "not_valid_for_this_order_type": "當前訂單類型不適用"
+    "not_valid_for_this_order_type": "當前訂單類型不適用",
+    "order_total_amount_not_enough": "滿 {currency}{value} 可用",
+    "applicable_product_total_amount_not_enough": "滿 {currency}{value} 可用",
+    "applicable_product_count_not_enough": "至少 {value} 件"
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/model/strategy/engine.d.ts

@@ -27,17 +27,30 @@ export declare class StrategyEngine {
      *
      * @param group 条件组
      * @param context 运行时上下文
-     * @returns 评估结果对象，包含条件是否满足和收集到的 actionIds
+     * @returns 评估结果对象，包含条件是否满足、收集到的 actionIds、以及失败的原子规则信息
      */
     private evaluateConditionGroup;
     /**
-     * 评估条件组的逻辑运算
+     * 评估条件组的逻辑运算（带失败规则收集）
+     *
+     * 失败规则收集策略：
+     * - `and`：返回第一个失败的原子规则（嵌套 group 递归取其首个失败原子规则）
+     * - `or`：所有分支失败时，聚合每个分支的失败规则
+     * - `not`：被取反规则实际通过时，记录该规则
+     */
+    private evaluateGroupLogicDetailed;
+    /**
+     * 评估单个规则（带失败规则收集）
+     */
+    private evaluateRuleDetailed;
+    /**
+     * 评估原子规则（不收集失败信息，仅返回布尔结果）
      */
-    private evaluateGroupLogic;
+    private evaluateAtomicRule;
     /**
-     * 评估单个规则
+     * 构建失败规则信息
      */
-    private evaluateRule;
+    private buildFailedRuleInfo;
     /**
      * 评估代码模式条件
      */