@pisell/pisellos 2.2.108 → 2.2.110

package/dist/solution/Checkout/index.js

@@ -2748,7 +2748,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "processCashPaymentItem",
     value: (function () {
       var _processCashPaymentItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(paymentItem) {
-        var cashPayment, remainingAmountStr, remainingAmount, cashAmount, changeAmount, processedPaymentItem;
+        var cashPayment, remainingAmountStr, remainingAmount, cashAmount, roundingAmount, chargeAmount, changeAmount, processedPaymentItem;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -2766,41 +2766,35 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               remainingAmountStr = _context28.sent;
               remainingAmount = new Decimal(remainingAmountStr);
-              cashAmount = new Decimal(String(paymentItem.amount)); // 如果现金金额小于等于剩余待付金额，无需找零
+              cashAmount = new Decimal(String(paymentItem.amount));
+              roundingAmount = new Decimal(String(paymentItem.rounding_amount || '0')); // 如果现金金额小于等于剩余待付金额，无需找零
               if (!cashAmount.lte(remainingAmount)) {
-                _context28.next = 11;
+                _context28.next = 12;
                 break;
               }
               return _context28.abrupt("return", paymentItem);
-            case 11:
-              // 使用 Decimal.js 安全计算找零金额
-              changeAmount = cashAmount.sub(remainingAmount); // 如果还有 rounding_amount 的配置，要判断是否和 changeAmount 相等
-              if (!(Number(paymentItem.rounding_amount) > 0)) {
-                _context28.next = 18;
-                break;
-              }
-              if (!(Number(paymentItem.rounding_amount) === changeAmount.toNumber())) {
-                _context28.next = 17;
+            case 12:
+              // 超付场景使用 rounding 回算应收金额（兼容 UI 已做抹零 + 允许超付）
+              chargeAmount = Decimal.max(remainingAmount.add(roundingAmount), new Decimal(0));
+              if (!cashAmount.lte(chargeAmount)) {
+                _context28.next = 15;
                 break;
               }
               return _context28.abrupt("return", paymentItem);
-            case 17:
-              // 如果不等于，则remainingAmount需要加上 rounding_amount，避免这里被改为未舍入金额
-              remainingAmount = remainingAmount.add(new Decimal(paymentItem.rounding_amount || '0'));
-            case 18:
-              // 创建包含找零信息的支付项
+            case 15:
+              changeAmount = cashAmount.sub(chargeAmount); // 创建包含找零信息的支付项
               processedPaymentItem = _objectSpread(_objectSpread({}, paymentItem), {}, {
-                amount: remainingAmount.toFixed(2),
-                // 将 amount 设置为剩余待付金额，保留2位小数
+                amount: chargeAmount.toFixed(2),
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
                   actual_paid_amount: cashAmount.toNumber(),
-                  // 实付金额
-                  change_given_amount: changeAmount.toNumber() // 找零金额
+                  change_given_amount: changeAmount.toNumber()
                 })
               });
               this.logInfo('Cash payment with change processed', {
                 originalAmount: cashAmount.toFixed(2),
-                chargedAmount: remainingAmount.toFixed(2),
+                remainingAmount: remainingAmount.toFixed(2),
+                roundingAmount: roundingAmount.toFixed(2),
+                chargedAmount: chargeAmount.toFixed(2),
                 changeAmount: changeAmount.toFixed(2),
                 paymentCode: paymentItem.code,
                 paymentType: paymentItem.type,
@@ -2808,21 +2802,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 decimalPrecisionCheck: {
                   cashAmountPrecise: cashAmount.toString(),
                   remainingAmountPrecise: remainingAmount.toString(),
+                  roundingAmountPrecise: roundingAmount.toString(),
+                  chargeAmountPrecise: chargeAmount.toString(),
                   changeAmountPrecise: changeAmount.toString()
                 }
               });
               return _context28.abrupt("return", processedPaymentItem);
-            case 23:
-              _context28.prev = 23;
+            case 21:
+              _context28.prev = 21;
               _context28.t0 = _context28["catch"](3);
               this.logError('处理现金支付项时出错:', _context28.t0);
               // 出错时返回原始支付项，避免中断支付流程
               return _context28.abrupt("return", paymentItem);
-            case 27:
+            case 25:
             case "end":
               return _context28.stop();
           }
-        }, _callee28, this, [[3, 23]]);
+        }, _callee28, this, [[3, 21]]);
       }));
       function processCashPaymentItem(_x27) {
         return _processCashPaymentItem.apply(this, arguments);

package/dist/solution/Sales/index.js

@@ -321,7 +321,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getBookingStatus",
     value: function getBookingStatus(appointmentStatus) {
       if (appointmentStatus === 'started') return 'occupied';
-      if (appointmentStatus === 'new' || appointmentStatus === 'confirmed' || appointmentStatus === 'arrived') {
+      if (appointmentStatus === 'confirmed' || appointmentStatus === 'arrived') {
         return 'reserved';
       }
       // TODO: locked 的业务规则后续补充。
@@ -383,6 +383,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           return startAt.isValid() && startAt.valueOf() === nextStartAt;
         });
         if (nextStartGroup.length === 0) return selectedBookings;
+        nextStartGroup.forEach(function (booking) {
+          booking.isNext = true;
+        });
         return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(nextStartGroup));
       };
 
@@ -431,7 +434,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeMatchedBooking(current, deviceCurrent, booking) {
       var _ref3, _booking$appointment_;
       var appointmentStatus = String((_ref3 = (_booking$appointment_ = booking.appointment_status) !== null && _booking$appointment_ !== void 0 ? _booking$appointment_ : booking.status) !== null && _ref3 !== void 0 ? _ref3 : '');
-      if (appointmentStatus === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
+      if (appointmentStatus === 'new' || appointmentStatus === 'rejected' || appointmentStatus === 'cancelled' || appointmentStatus === 'completed') {
         return null;
       }
       var endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
@@ -463,6 +466,25 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           lateTime = Math.max(current.diff(startAt, 'minute'), 0);
         }
       }
+
+      // 未来查询投影：查询时间晚于设备时间时，预留+迟到且 end_time 仍在查询时间之后的预约强制视为占用
+      if (current.isAfter(deviceCurrent) && bookingStatus === 'reserved' && reservedStatus === 'late' && endAt.isValid() && endAt.isAfter(current)) {
+        bookingStatus = 'occupied';
+        reservedStatus = undefined;
+        lateTime = undefined;
+        remainingReserveTime = undefined;
+        isTimeout = false;
+        timeoutTime = undefined;
+        progressPercent = function () {
+          if (!startAt.isValid() || !endAt.isValid()) return 0;
+          var totalMinutes = endAt.diff(startAt, 'minute');
+          if (totalMinutes <= 0) return 0;
+          var elapsedMinutes = current.diff(startAt, 'minute');
+          if (elapsedMinutes <= 0) return 0;
+          if (elapsedMinutes >= totalMinutes) return 100;
+          return Math.floor(elapsedMinutes / totalMinutes * 100);
+        }();
+      }
       return _objectSpread(_objectSpread({}, booking), {}, {
         status: bookingStatus,
         isTimeout: isTimeout,

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

@@ -20,6 +20,7 @@ export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
+    isNext?: boolean;
     isTimeout: boolean;
     timeoutTime?: number;
     progressPercent?: number;

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
+});

package/lib/solution/Checkout/index.js

@@ -1835,36 +1835,34 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     try {
       const remainingAmountStr = await this.calculateRemainingAmountAsync();
-      let remainingAmount = new import_decimal.default(remainingAmountStr);
+      const remainingAmount = new import_decimal.default(remainingAmountStr);
       const cashAmount = new import_decimal.default(String(paymentItem.amount));
+      const roundingAmount = new import_decimal.default(String(paymentItem.rounding_amount || "0"));
       if (cashAmount.lte(remainingAmount)) {
         return paymentItem;
       }
-      const changeAmount = cashAmount.sub(remainingAmount);
-      if (Number(paymentItem.rounding_amount) > 0) {
-        if (Number(paymentItem.rounding_amount) === changeAmount.toNumber()) {
-          return paymentItem;
-        } else {
-          remainingAmount = remainingAmount.add(
-            new import_decimal.default(paymentItem.rounding_amount || "0")
-          );
-        }
+      const chargeAmount = import_decimal.default.max(
+        remainingAmount.add(roundingAmount),
+        new import_decimal.default(0)
+      );
+      if (cashAmount.lte(chargeAmount)) {
+        return paymentItem;
       }
+      const changeAmount = cashAmount.sub(chargeAmount);
       const processedPaymentItem = {
         ...paymentItem,
-        amount: remainingAmount.toFixed(2),
-        // 将 amount 设置为剩余待付金额，保留2位小数
+        amount: chargeAmount.toFixed(2),
         metadata: {
           ...paymentItem.metadata,
           actual_paid_amount: cashAmount.toNumber(),
-          // 实付金额
           change_given_amount: changeAmount.toNumber()
-          // 找零金额
         }
       };
       this.logInfo("Cash payment with change processed", {
         originalAmount: cashAmount.toFixed(2),
-        chargedAmount: remainingAmount.toFixed(2),
+        remainingAmount: remainingAmount.toFixed(2),
+        roundingAmount: roundingAmount.toFixed(2),
+        chargedAmount: chargeAmount.toFixed(2),
         changeAmount: changeAmount.toFixed(2),
         paymentCode: paymentItem.code,
         paymentType: paymentItem.type,
@@ -1872,6 +1870,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         decimalPrecisionCheck: {
           cashAmountPrecise: cashAmount.toString(),
           remainingAmountPrecise: remainingAmount.toString(),
+          roundingAmountPrecise: roundingAmount.toString(),
+          chargeAmountPrecise: chargeAmount.toString(),
           changeAmountPrecise: changeAmount.toString()
         }
       });

package/lib/solution/Sales/index.js

@@ -218,7 +218,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
   getBookingStatus(appointmentStatus) {
     if (appointmentStatus === "started")
       return "occupied";
-    if (appointmentStatus === "new" || appointmentStatus === "confirmed" || appointmentStatus === "arrived") {
+    if (appointmentStatus === "confirmed" || appointmentStatus === "arrived") {
       return "reserved";
     }
     if (appointmentStatus === "locked")
@@ -278,6 +278,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       });
       if (nextStartGroup.length === 0)
         return selectedBookings;
+      nextStartGroup.forEach((booking) => {
+        booking.isNext = true;
+      });
       return [...selectedBookings, ...nextStartGroup];
     };
     const activeBookings = dayScopedBookings.filter((booking) => {
@@ -317,18 +320,18 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    */
   normalizeMatchedBooking(current, deviceCurrent, booking) {
     const appointmentStatus = String(booking.appointment_status ?? booking.status ?? "");
-    if (appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
+    if (appointmentStatus === "new" || appointmentStatus === "rejected" || appointmentStatus === "cancelled" || appointmentStatus === "completed") {
       return null;
     }
     const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
     const shouldFilterHistoryByCurrent = deviceCurrent.isBefore(current);
     if (shouldFilterHistoryByCurrent && endAt.isValid() && endAt.isBefore(current))
       return null;
-    const bookingStatus = this.getBookingStatus(appointmentStatus);
+    let bookingStatus = this.getBookingStatus(appointmentStatus);
     const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
-    const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
-    const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
-    const progressPercent = (() => {
+    let isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
+    let timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
+    let progressPercent = (() => {
       if (bookingStatus !== "occupied")
         return 0;
       if (!startAt.isValid() || !endAt.isValid())
@@ -355,6 +358,27 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
         lateTime = Math.max(current.diff(startAt, "minute"), 0);
       }
     }
+    if (current.isAfter(deviceCurrent) && bookingStatus === "reserved" && reservedStatus === "late" && endAt.isValid() && endAt.isAfter(current)) {
+      bookingStatus = "occupied";
+      reservedStatus = void 0;
+      lateTime = void 0;
+      remainingReserveTime = void 0;
+      isTimeout = false;
+      timeoutTime = void 0;
+      progressPercent = (() => {
+        if (!startAt.isValid() || !endAt.isValid())
+          return 0;
+        const totalMinutes = endAt.diff(startAt, "minute");
+        if (totalMinutes <= 0)
+          return 0;
+        const elapsedMinutes = current.diff(startAt, "minute");
+        if (elapsedMinutes <= 0)
+          return 0;
+        if (elapsedMinutes >= totalMinutes)
+          return 100;
+        return Math.floor(elapsedMinutes / totalMinutes * 100);
+      })();
+    }
     return {
       ...booking,
       status: bookingStatus,

package/lib/solution/Sales/types.d.ts

@@ -20,6 +20,7 @@ export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
+    isNext?: boolean;
     isTimeout: boolean;
     timeoutTime?: number;
     progressPercent?: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.108",
+  "version": "2.2.110",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",