@pisell/pisellos 0.0.247 → 0.0.248

package/dist/modules/Payment/index.js

@@ -1750,9 +1750,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           if (payment.status === 'voided') {
             return sum;
           }
-          return sum.plus(payment.amount);
+
+          // 计算有效支付金额：支付金额 + 抹零金额的绝对值
+          // 当 rounding_amount 为负数时，表示抹掉的金额，按绝对值计算有效支付
+          // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
+          var paymentAmount = new Decimal(payment.amount || 0);
+          var roundingAmount = new Decimal(payment.rounding_amount || 0);
+          var effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          return sum.plus(effectiveAmount);
         } catch (error) {
-          console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: ".concat(payment.amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
+          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"));
           return sum;
         }
       }, new Decimal(0));
@@ -1761,14 +1768,25 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       console.log("[PaymentModule] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:", {
         orderUuid: order.uuid,
         totalAmount: order.total_amount,
-        paidAmount: paidAmount.toFixed(2),
+        effectivePaidAmount: paidAmount.toFixed(2),
         remainingAmount: order.expect_amount,
         activePayments: order.payment.filter(function (p) {
           return p.status !== 'voided';
         }).length,
         voidedPayments: order.payment.filter(function (p) {
           return p.status === 'voided';
-        }).length
+        }).length,
+        paymentDetails: order.payment.filter(function (p) {
+          return p.status !== 'voided';
+        }).map(function (p) {
+          return {
+            code: p.code,
+            amount: p.amount,
+            rounding_amount: p.rounding_amount || '0.00',
+            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+          };
+        }),
+        说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'
       });
     }
 

package/dist/modules/Payment/types.d.ts

@@ -222,6 +222,15 @@ export interface PaymentItemInput {
     rounding_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 扩展参数字段 */
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rounding规则 */
+        rounding_rule?: any;
+    };
 }
 /**
  * 推送支付项参数

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

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -1660,7 +1660,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(paymentItem) {
-        var _paymentItem$type, _paymentItem$code, orderPaymentType, paymentItemWithType, isEftposPayment;
+        var _paymentItem$type, _paymentItem$code, orderPaymentType, metadata, paymentItemWithType, isEftposPayment;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1672,9 +1672,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单，无法添加支付项');
             case 3:
               // 根据当前订单的定金状态设置订单支付类型
-              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 设置支付项的订单支付类型
+              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 从 otherParams 获取 metadata 字段
+              metadata = _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
+                rounding_rule: this.otherParams.order_rounding_setting,
+                shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
+              }); // 设置支付项的订单支付类型和 metadata
               paymentItemWithType = _objectSpread(_objectSpread({}, paymentItem), {}, {
-                order_payment_type: orderPaymentType
+                order_payment_type: orderPaymentType,
+                metadata: metadata
               });
               console.log('[Checkout] 为当前订单添加支付项:', {
                 orderUuid: this.store.currentOrder.uuid,
@@ -1686,16 +1691,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   service_charge: paymentItemWithType.service_charge,
                   rounding_amount: paymentItemWithType.rounding_amount,
                   voucher_id: paymentItemWithType.voucher_id,
-                  order_payment_type: paymentItemWithType.order_payment_type
+                  order_payment_type: paymentItemWithType.order_payment_type,
+                  metadata: paymentItemWithType.metadata
                 },
                 orderDepositStatus: this.store.currentOrder.is_deposit,
                 calculatedOrderPaymentType: orderPaymentType
               });
 
               // 添加支付项到订单
-              _context25.next = 8;
+              _context25.next = 9;
               return this.payment.addPaymentItemAsync(this.store.currentOrder.uuid, paymentItemWithType);
-            case 8:
+            case 9:
               console.log('[Checkout] 支付项添加成功');
 
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
@@ -1707,54 +1713,54 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currentOrderSynced: this.store.isOrderSynced
               });
               if (!isEftposPayment) {
-                _context25.next = 24;
+                _context25.next = 25;
                 break;
               }
               console.log('[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context25.prev = 13;
-              _context25.next = 16;
+              _context25.prev = 14;
+              _context25.next = 17;
               return this.syncOrderToBackendWithReturn(true);
-            case 16:
+            case 17:
               console.log('[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 订单ID: this.store.currentOrder.order_id,
                 是否已同步: this.store.isOrderSynced
               });
-              _context25.next = 24;
+              _context25.next = 25;
               break;
-            case 19:
-              _context25.prev = 19;
-              _context25.t0 = _context25["catch"](13);
+            case 20:
+              _context25.prev = 20;
+              _context25.t0 = _context25["catch"](14);
               console.error('[Checkout] EFTPOS 支付后订单同步失败:', _context25.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context25.next = 24;
+              _context25.next = 25;
               return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0))), CheckoutErrorType.OrderCreationFailed);
-            case 24:
-              _context25.next = 26;
+            case 25:
+              _context25.next = 27;
               return this.updateStateAmountToRemaining();
-            case 26:
-              _context25.next = 28;
+            case 27:
+              _context25.next = 29;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 28:
-              _context25.next = 36;
+            case 29:
+              _context25.next = 37;
               break;
-            case 30:
-              _context25.prev = 30;
+            case 31:
+              _context25.prev = 31;
               _context25.t1 = _context25["catch"](0);
               console.error('[Checkout] 添加支付项失败:', _context25.t1);
-              _context25.next = 35;
+              _context25.next = 36;
               return this.handleError(_context25.t1, CheckoutErrorType.PaymentFailed);
-            case 35:
-              throw _context25.t1;
             case 36:
+              throw _context25.t1;
+            case 37:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[0, 30], [13, 19]]);
+        }, _callee25, this, [[0, 31], [14, 20]]);
       }));
       function addPaymentItemAsync(_x16) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1889,6 +1895,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(voucherPaymentItems) {
+        var _this3 = this;
         var orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder, voucherItems;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -1907,13 +1914,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 根据当前订单的定金状态设置订单支付类型
-              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 验证所有支付项都包含 voucher_id，并设置 order_payment_type
+              orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 验证所有支付项都包含 voucher_id，并设置 order_payment_type 和 metadata
               voucherPaymentItemsWithType = voucherPaymentItems.map(function (item) {
                 if (!item.voucher_id) {
                   throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u4EE3\u91D1\u5238\u652F\u4ED8\u9879\u7F3A\u5C11 voucher_id: ".concat(JSON.stringify(item)));
                 }
+
+                // 从 otherParams 获取 metadata 字段
+                var metadata = _objectSpread(_objectSpread({}, item.metadata), {}, {
+                  rounding_rule: _this3.otherParams.order_rounding_setting,
+                  shop_wallet_pass_id: _this3.otherParams.shop_wallet_pass_id
+                });
                 return _objectSpread(_objectSpread({}, item), {}, {
-                  order_payment_type: orderPaymentType
+                  order_payment_type: orderPaymentType,
+                  metadata: metadata
                 });
               });
               console.log('[Checkout] 代金券支付项订单支付类型设置:', {
@@ -3240,7 +3254,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     uuid: p.uuid,
                     amount: p.amount,
                     code: p.code,
-                    status: p.status
+                    status: p.status,
+                    rounding_amount: p.rounding_amount
                   };
                 })
               });
@@ -3249,8 +3264,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }) // 只计算未撤销的支付项
               .reduce(function (sum, payment) {
                 var amount = parseFloat(payment.amount || '0');
-                console.log("[Checkout] \u8BA1\u7B97\u652F\u4ED8\u9879: ".concat(payment.code, " = ").concat(amount));
-                return sum + amount;
+                var roundingAmount = parseFloat(payment.rounding_amount || '0');
+
+                // 计算实际支付有效金额：
+                // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
+                // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
+                var effectiveAmount = amount + Math.abs(roundingAmount);
+                console.log("[Checkout] \u8BA1\u7B97\u652F\u4ED8\u9879: ".concat(payment.code), {
+                  原始金额: amount,
+                  抹零金额: roundingAmount,
+                  有效金额: effectiveAmount,
+                  说明: roundingAmount !== 0 ? "\u62B9\u96F6\u91D1\u989D ".concat(roundingAmount, " \u5143\uFF0C\u6709\u6548\u652F\u4ED8\u589E\u52A0 ").concat(Math.abs(roundingAmount), " \u5143") : '无抹零'
+                });
+                return sum + effectiveAmount;
               }, 0);
               result = paidAmount.toFixed(2);
               console.log('[Checkout] calculatePaidAmountAsync: 计算结果 =', result);
@@ -3304,7 +3330,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 totalAmount: totalAmount.toFixed(2),
                 paidAmount: paidAmount.toFixed(2),
                 calculatedRemaining: remainingAmount.toFixed(2),
-                finalResult: result
+                finalResult: result,
+                说明: '已支付金额包含抹零计算（amount + |rounding_amount|）'
               });
               return _context43.abrupt("return", result);
             case 13:
@@ -3537,6 +3564,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     uuid: p.uuid,
                     code: p.code,
                     amount: p.amount,
+                    rounding_amount: p.rounding_amount,
+                    effective_amount: (parseFloat(p.amount || '0') + Math.abs(parseFloat(p.rounding_amount || '0'))).toFixed(2),
                     voucher_id: p.voucher_id,
                     status: p.status
                   };
@@ -3759,7 +3788,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     amount: p.amount,
                     uniquePaymentNumber: (_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.unique_payment_number,
                     voucherId: p.voucher_id,
-                    orderPaymentType: p.order_payment_type
+                    orderPaymentType: p.order_payment_type,
+                    metadata: p.metadata
                   };
                 })
               });

package/lib/modules/Payment/index.js

@@ -866,9 +866,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           if (payment.status === "voided") {
             return sum;
           }
-          return sum.plus(payment.amount);
+          const paymentAmount = new import_decimal.Decimal(payment.amount || 0);
+          const roundingAmount = new import_decimal.Decimal(payment.rounding_amount || 0);
+          const effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          return sum.plus(effectiveAmount);
         } catch (error) {
-          console.warn(`[PaymentModule] 无效的支付金额: ${payment.amount}，跳过计算`);
+          console.warn(`[PaymentModule] 无效的支付金额: amount=${payment.amount}, rounding_amount=${payment.rounding_amount}，跳过计算`);
           return sum;
         }
       },
@@ -879,10 +882,17 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     console.log(`[PaymentModule] 重新计算订单金额:`, {
       orderUuid: order.uuid,
       totalAmount: order.total_amount,
-      paidAmount: paidAmount.toFixed(2),
+      effectivePaidAmount: paidAmount.toFixed(2),
       remainingAmount: order.expect_amount,
       activePayments: order.payment.filter((p) => p.status !== "voided").length,
-      voidedPayments: order.payment.filter((p) => p.status === "voided").length
+      voidedPayments: order.payment.filter((p) => p.status === "voided").length,
+      paymentDetails: order.payment.filter((p) => p.status !== "voided").map((p) => ({
+        code: p.code,
+        amount: p.amount,
+        rounding_amount: p.rounding_amount || "0.00",
+        effective_amount: new import_decimal.Decimal(p.amount || 0).plus(new import_decimal.Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+      })),
+      说明: "有效支付金额包含抹零计算（amount + |rounding_amount|）"
     });
   }
   /**

package/lib/modules/Payment/types.d.ts

@@ -222,6 +222,15 @@ export interface PaymentItemInput {
     rounding_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 扩展参数字段 */
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rounding规则 */
+        rounding_rule?: any;
+    };
 }
 /**
  * 推送支付项参数

package/lib/solution/BookingByStep/index.d.ts

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -940,9 +940,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         );
       }
       const orderPaymentType = this.store.currentOrder.is_deposit === 1 ? "deposit" : "normal";
+      const metadata = {
+        ...paymentItem.metadata,
+        rounding_rule: this.otherParams.order_rounding_setting,
+        shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
+      };
       const paymentItemWithType = {
         ...paymentItem,
-        order_payment_type: orderPaymentType
+        order_payment_type: orderPaymentType,
+        metadata
       };
       console.log("[Checkout] 为当前订单添加支付项:", {
         orderUuid: this.store.currentOrder.uuid,
@@ -954,7 +960,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           service_charge: paymentItemWithType.service_charge,
           rounding_amount: paymentItemWithType.rounding_amount,
           voucher_id: paymentItemWithType.voucher_id,
-          order_payment_type: paymentItemWithType.order_payment_type
+          order_payment_type: paymentItemWithType.order_payment_type,
+          metadata: paymentItemWithType.metadata
         },
         orderDepositStatus: this.store.currentOrder.is_deposit,
         calculatedOrderPaymentType: orderPaymentType
@@ -1112,9 +1119,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             `代金券支付项缺少 voucher_id: ${JSON.stringify(item)}`
           );
         }
+        const metadata = {
+          ...item.metadata,
+          rounding_rule: this.otherParams.order_rounding_setting,
+          shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
+        };
         return {
           ...item,
-          order_payment_type: orderPaymentType
+          order_payment_type: orderPaymentType,
+          metadata
         };
       });
       console.log("[Checkout] 代金券支付项订单支付类型设置:", {
@@ -1984,13 +1997,21 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           uuid: p.uuid,
           amount: p.amount,
           code: p.code,
-          status: p.status
+          status: p.status,
+          rounding_amount: p.rounding_amount
         }))
       });
       const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
         const amount = parseFloat(payment.amount || "0");
-        console.log(`[Checkout] 计算支付项: ${payment.code} = ${amount}`);
-        return sum + amount;
+        const roundingAmount = parseFloat(payment.rounding_amount || "0");
+        const effectiveAmount = amount + Math.abs(roundingAmount);
+        console.log(`[Checkout] 计算支付项: ${payment.code}`, {
+          原始金额: amount,
+          抹零金额: roundingAmount,
+          有效金额: effectiveAmount,
+          说明: roundingAmount !== 0 ? `抹零金额 ${roundingAmount} 元，有效支付增加 ${Math.abs(roundingAmount)} 元` : "无抹零"
+        });
+        return sum + effectiveAmount;
       }, 0);
       const result = paidAmount.toFixed(2);
       console.log("[Checkout] calculatePaidAmountAsync: 计算结果 =", result);
@@ -2017,7 +2038,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       totalAmount: totalAmount.toFixed(2),
       paidAmount: paidAmount.toFixed(2),
       calculatedRemaining: remainingAmount.toFixed(2),
-      finalResult: result
+      finalResult: result,
+      说明: "已支付金额包含抹零计算（amount + |rounding_amount|）"
     });
     return result;
   }
@@ -2137,6 +2159,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             uuid: p.uuid,
             code: p.code,
             amount: p.amount,
+            rounding_amount: p.rounding_amount,
+            effective_amount: (parseFloat(p.amount || "0") + Math.abs(parseFloat(p.rounding_amount || "0"))).toFixed(2),
             voucher_id: p.voucher_id,
             status: p.status
           }))
@@ -2261,7 +2285,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           amount: p.amount,
           uniquePaymentNumber: (_a2 = p.metadata) == null ? void 0 : _a2.unique_payment_number,
           voucherId: p.voucher_id,
-          orderPaymentType: p.order_payment_type
+          orderPaymentType: p.order_payment_type,
+          metadata: p.metadata
         };
       })
     });

package/package.json

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