@pisell/pisellos 2.1.150 → 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;
@@ -29,7 +30,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
-    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -57,7 +57,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'edit';
+        action?: 'create' | 'update';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

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) || {
@@ -440,10 +443,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             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) {
@@ -504,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'
               }) || {
@@ -617,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,
@@ -778,27 +785,24 @@ 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, 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:
+              });
+            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;
@@ -811,35 +815,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 13;
+              _context10.next = 12;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 13:
+            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 = 20;
+                _context10.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 20;
+              _context10.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 20:
-              _context10.next = 22;
-              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 22:
-              _context10.next = 27;
+            case 19:
+              _context10.next = 21;
+              return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
+            case 21:
+              _context10.next = 26;
               break;
-            case 24:
-              _context10.prev = 24;
+            case 23:
+              _context10.prev = 23;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 27:
+            case 26:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 24]]);
+        }, _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,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/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});