@pisell/pisellos 0.0.310 → 0.0.312

package/dist/modules/Payment/walletpass.js

@@ -128,7 +128,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
             case 0:
               startTime = Date.now();
               walletParams = this.generateWalletParams(businessData);
-              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) < 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) < 0 || [1, 0].includes(walletParams === null || walletParams === void 0 ? void 0 : walletParams.customer_id))) {
+              if (!(Number((businessData === null || businessData === void 0 || (_businessData$amountI = businessData.amountInfo) === null || _businessData$amountI === void 0 ? void 0 : _businessData$amountI.totalAmount) || 0) < 0 || Number((businessData === null || businessData === void 0 || (_businessData$amountI2 = businessData.amountInfo) === null || _businessData$amountI2 === void 0 ? void 0 : _businessData$amountI2.subTotal) || 0) < 0)) {
                 _context.next = 4;
                 break;
               }

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

@@ -326,7 +326,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

@@ -677,7 +677,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
-        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, isNeedDeposit, created;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, depositDiffAmount, isNeedDeposit, created;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -730,7 +730,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
               });
               if (!existingOrder) {
-                _context10.next = 42;
+                _context10.next = 44;
                 break;
               }
               // 基于现有支付项计算新的 expect_amount
@@ -798,15 +798,19 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 var rounding = new Decimal(p.rounding_amount || '0').abs();
                 return sum.plus(amt).plus(rounding);
               }, new Decimal(0));
-              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2);
+              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2); // 要计算一个总价的差值和一个定金的差值，如果定金的差值>0，则需要使用定金的差值，否则使用总价的差值
+              depositDiffAmount = new Decimal(0).toFixed(2);
+              if (updated.is_deposit === 1) {
+                depositDiffAmount = new Decimal(updated.deposit_amount).minus(syncedAmount).toFixed(2);
+              }
               this.initWalletData({
-                order_wait_pay_amount: Number(remainingExpectAmount)
+                order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
               });
               return _context10.abrupt("return", updated);
-            case 42:
+            case 44:
               // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
               isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
-              _context10.next = 45;
+              _context10.next = 47;
               return this.payment.createPaymentOrderAsync({
                 order_id: String(params.orderId),
                 total_amount: amountInfo.totalAmount,
@@ -823,12 +827,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 45:
+            case 47:
               created = _context10.sent;
               this.store.currentOrder = created;
               this.initWalletData();
               return _context10.abrupt("return", created);
-            case 49:
+            case 51:
             case "end":
               return _context10.stop();
           }

package/lib/modules/Payment/walletpass.js

@@ -99,7 +99,7 @@ var WalletPassPaymentImpl = class {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const startTime = Date.now();
     const walletParams = this.generateWalletParams(businessData);
-    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0 || [1, 0].includes(walletParams == null ? void 0 : walletParams.customer_id)) {
+    if (Number(((_a = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _a.totalAmount) || 0) < 0 || Number(((_b = businessData == null ? void 0 : businessData.amountInfo) == null ? void 0 : _b.subTotal) || 0) < 0) {
       return {
         walletRecommendList: [],
         userIdentificationCodes: []

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

@@ -326,7 +326,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

@@ -530,8 +530,12 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
         2
       );
+      let depositDiffAmount = new import_decimal.default(0).toFixed(2);
+      if (updated.is_deposit === 1) {
+        depositDiffAmount = new import_decimal.default(updated.deposit_amount).minus(syncedAmount).toFixed(2);
+      }
       this.initWalletData({
-        order_wait_pay_amount: Number(remainingExpectAmount)
+        order_wait_pay_amount: Number(depositDiffAmount) > 0 ? Number(depositDiffAmount) : Number(remainingExpectAmount)
       });
       return updated;
     }

package/package.json

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