@pisell/pisellos 2.2.49 → 2.2.51

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/solution/BookingByStep/index.js

@@ -1161,7 +1161,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
       // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
       if (isSessionProduct(productData)) {
         if (!date || !date.startTime || !date.endTime) {

package/dist/solution/Checkout/index.js

@@ -893,6 +893,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _syncedAmount = syncedPayments.reduce(function (sum, p) {
                 var amt = new Decimal(p.amount || '0');
                 var rounding = new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || '0').abs();
+                if (p.service_fee) {
+                  amt = amt.minus(new Decimal(p.service_fee));
+                }
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
               _totalAmount = new Decimal(amountInfo.totalAmount || '0');
@@ -3134,6 +3137,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         // 当 rounding_amount 为负数时，表示抹掉的金额，应该按绝对值加到实际支付中
         // 例如：amount=15, rounding_amount=-0.2，实际相当于支付了15.2（抹掉了0.2元的零头）
         var effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+        if (payment.service_fee) {
+          effectiveAmount = effectiveAmount.minus(new Decimal(payment.service_fee));
+        }
         return sum.add(effectiveAmount);
       }, new Decimal(0));
       return paidAmount.toFixed(2);

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/solution/BookingByStep/index.js

@@ -606,7 +606,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
     if ((0, import_products.isSessionProduct)(productData)) {
       if (!date || !date.startTime || !date.endTime) {
         return { success: false, errorCode: "date_or_time_required" };

package/lib/solution/Checkout/index.js

@@ -605,8 +605,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         });
         const syncedPayments = updated2.payment.filter((p) => p.isSynced && p.status !== "voided");
         const syncedAmount2 = syncedPayments.reduce((sum, p) => {
-          const amt = new import_decimal.default(p.amount || "0");
+          let amt = new import_decimal.default(p.amount || "0");
           const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
+          if (p.service_fee) {
+            amt = amt.minus(new import_decimal.default(p.service_fee));
+          }
           return sum.plus(amt).plus(rounding);
         }, new import_decimal.default(0));
         const totalAmount2 = new import_decimal.default(amountInfo.totalAmount || "0");
@@ -2030,7 +2033,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     const paidAmount = payments.filter((payment) => payment.status !== "voided").reduce((sum, payment) => {
       const amount = new import_decimal.default(payment.amount || "0");
       const roundingAmount = new import_decimal.default(payment.rounding_amount || "0");
-      const effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+      let effectiveAmount = amount.add(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
+      if (payment.service_fee) {
+        effectiveAmount = effectiveAmount.minus(new import_decimal.default(payment.service_fee));
+      }
       return sum.add(effectiveAmount);
     }, new import_decimal.default(0));
     return paidAmount.toFixed(2);

package/package.json

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