@pisell/pisellos 2.2.60 → 2.2.61

package/dist/modules/Payment/index.js

@@ -332,7 +332,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 1. 筛选 status === 1 && disable === 0的数据
               // 2. 检查列表里是否有 code=WALLET_PASS的数据，如果没有，则列表里如果有 PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 则删除他们
               // 如果有 code = WALLET_PASS的数据，则列表里PRODUCTVOUCHER 、 GIFTCARD 、 POINTCARD 的channel_application 指向 WALLET_PASS 的 channel_application
-              payMethods.filter(function (method) {
+              payMethods = payMethods.filter(function (method) {
                 return method.status === 1 && method.disable === 0;
               });
               walletPassMethod = payMethods.find(function (method) {
@@ -442,8 +442,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
             case 46:
               this.logInfo('getPayMethodListAsync completed successfully', {
-                methodCount: payMethods.length,
-                hasCache: cachedMethods.length > 0
+                payMethods: payMethods
               });
               return _context4.abrupt("return", payMethods);
             case 50:
@@ -2014,9 +2013,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 计算有效支付金额：支付金额 + 抹零金额的绝对值
           // 当 rounding_amount 为负数时，表示抹掉的金额，按绝对值计算有效支付
           // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
+          // 例2：amount=15,rounding_amount=0.2,有效支付 14.8 
           var paymentAmount = new Decimal(payment.amount || 0);
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
-          var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+          var effectiveAmount = paymentAmount.minus(roundingAmount);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
@@ -2044,7 +2044,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
+            effective_amount: new Decimal(p.amount || 0).minus(new Decimal(p.rounding_amount || 0)).toFixed(2)
           };
         }),
         说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'

package/dist/modules/Rules/index.js

@@ -1579,8 +1579,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: newTotalWithDiscount,
-                origin_total: newOriginTotalWithDiscount
+                total: new Decimal(newTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber(),
+                origin_total: new Decimal(newOriginTotalWithDiscount).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber()
               })));
 
               // 第二个：包含原始bundle (qty=原quantity-1)
@@ -1642,6 +1642,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotalOriginal)).toNumber();
                 }
+                newTotalOriginal = new Decimal(newTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                newOriginTotalOriginal = new Decimal(newOriginTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 添加第二个主商品：qty=原quantity-1，包含原始bundle
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
@@ -1746,6 +1748,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     return accumulator.add(currentPrice.mul(currentNum));
                   }, new Decimal(newTotal)).toNumber();
                 }
+                newTotal = new Decimal(newTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+                newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 生成最终的主商品
                 result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {

package/dist/modules/Schedule/getDateIsInSchedule.d.ts

@@ -0,0 +1,32 @@
+import dayjs from "dayjs";
+import { ScheduleItem } from "./types";
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+export type ScheduleTimeSlot = {
+    /** 开始时间 HH:mm */
+    start_time: string;
+    /** 结束时间 HH:mm */
+    end_time: string;
+    /** 开始日期时间 YYYY-MM-DD HH:mm:ss */
+    start_at: dayjs.Dayjs;
+    /** 结束日期时间 YYYY-MM-DD HH:mm:ss */
+    end_at: dayjs.Dayjs;
+};
+/**
+ * 获取当前日期日程时间点
+ * @param date 日期 YYYY-MM-DD
+ * @param scheduleList 日程列表
+ * @returns 当前日期日程时间点 结构，数组 [{
+ *
+ *  // HH:mm
+ *  end_time: string,
+ *  // HH:mm
+ *  start_time: string,
+ *  // 日期时间
+ *  // YYYY-MM-DD HH:mm:ss
+ *  end_at: Dayjs,
+ *  // YYYY-MM-DD HH:mm:ss
+ *  start_at: Dayjs,
+ *
+ * }]
+ */
+export declare const getScheduleStartEndTimePoints: (date: string, scheduleList: ScheduleItem[]) => ScheduleTimeSlot[];