@pisell/pisellos 0.0.304 → 0.0.305

package/dist/modules/Payment/index.js

@@ -1044,7 +1044,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, warningMessage, paymentUuid, newPaymentItem;
+        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1066,9 +1066,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               throw new Error("Order not found: ".concat(orderUuid));
             case 7:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
-              expectAmount = new Decimal(order.expect_amount); // const expecDepositAmount = new Decimal(order.deposit_amount);
-              if (!expectAmount.lte(0)) {
-                _context13.next = 13;
+              expectAmount = new Decimal(order.expect_amount);
+              paidDepositAmount = order.payment.reduce(function (sum, payment) {
+                if (payment.order_payment_type === 'deposit') {
+                  return sum.plus(new Decimal(payment.amount));
+                }
+                return sum;
+              }, new Decimal(0));
+              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
+              if (!(expectAmount.lte(0) && expectedDepositAmount.lte(0))) {
+                _context13.next = 15;
                 break;
               }
               warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
@@ -1085,7 +1092,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 13:
+            case 15:
               paymentUuid = getUniqueId('payment_');
               newPaymentItem = {
                 uuid: paymentUuid,
@@ -1108,15 +1115,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 19;
-              return this.dbManager.update('order', order);
-            case 19:
               _context13.next = 21;
+              return this.dbManager.update('order', order);
+            case 21:
+              _context13.next = 23;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 21:
+            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1130,10 +1137,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context13.next = 29;
+              _context13.next = 31;
               break;
-            case 24:
-              _context13.prev = 24;
+            case 26:
+              _context13.prev = 26;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1141,11 +1148,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 29:
+            case 31:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 24]]);
+        }, _callee13, this, [[1, 26]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -1645,7 +1645,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderDepositStatusAsync",
     value: (function () {
       var _updateOrderDepositStatusAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(isDeposit) {
-        var newDepositValue, oldDepositValue, updateParams;
+        var newDepositValue, oldDepositValue, deposit_amount, updateParams;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -1671,9 +1671,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] 定金状态无变化，跳过更新');
               return _context19.abrupt("return");
             case 10:
+              deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : '0.00'; // 如果原来没有 deposit_amount，则默认把待付金额置为 deposit_amount
+              if (!deposit_amount) {
+                deposit_amount = this.store.currentOrder.expect_amount;
+              }
+
               // 准备更新参数
               updateParams = {
-                is_deposit: newDepositValue
+                is_deposit: newDepositValue,
+                deposit_amount: deposit_amount
               }; // 如果从定金改为全款，可以清空定金金额
               // if (
               //   isDeposit === 0 &&
@@ -1683,9 +1689,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               //   this.logInfo('订单从定金改为全款，清空定金金额');
               // }
               // 调用 Payment 模块更新订单
-              _context19.next = 13;
+              _context19.next = 15;
               return this.payment.updateOrderAsync(this.store.currentOrder.uuid, updateParams);
-            case 13:
+            case 15:
               // 更新本地缓存的订单对象
               this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), updateParams);
 
@@ -1693,34 +1699,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               if (this.store.localOrderData) {
                 this.store.localOrderData.is_deposit = newDepositValue;
               }
-              this.updateStateAmountToRemaining();
+              this.updateStateAmountToRemaining(false);
 
               // 触发订单更新事件
-              _context19.next = 18;
+              _context19.next = 20;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: this.store.currentOrder,
                 timestamp: Date.now()
               });
-            case 18:
+            case 20:
               this.logInfo('订单定金状态更新成功:', {
                 isDeposit: newDepositValue,
                 depositAmount: this.store.currentOrder.deposit_amount
               });
-              _context19.next = 27;
+              _context19.next = 29;
               break;
-            case 21:
-              _context19.prev = 21;
+            case 23:
+              _context19.prev = 23;
               _context19.t0 = _context19["catch"](0);
               this.logError('更新订单定金状态失败:', _context19.t0);
-              _context19.next = 26;
+              _context19.next = 28;
               return this.handleError(_context19.t0, CheckoutErrorType.ValidationFailed);
-            case 26:
+            case 28:
               throw _context19.t0;
-            case 27:
+            case 29:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[0, 21]]);
+        }, _callee19, this, [[0, 23]]);
       }));
       function updateOrderDepositStatusAsync(_x18) {
         return _updateOrderDepositStatusAsync.apply(this, arguments);

package/lib/modules/Payment/index.js

@@ -528,7 +528,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         throw new Error(`Order not found: ${orderUuid}`);
       }
       const expectAmount = new import_decimal.Decimal(order.expect_amount);
-      if (expectAmount.lte(0)) {
+      const paidDepositAmount = order.payment.reduce((sum, payment) => {
+        if (payment.order_payment_type === "deposit") {
+          return sum.plus(new import_decimal.Decimal(payment.amount));
+        }
+        return sum;
+      }, new import_decimal.Decimal(0));
+      const expectedDepositAmount = new import_decimal.Decimal(order.deposit_amount || "0").sub(paidDepositAmount);
+      if (expectAmount.lte(0) && expectedDepositAmount.lte(0)) {
         const warningMessage = `订单 ${orderUuid} 待付金额已为0，不允许添加新的支付项`;
         console.warn("[PaymentModule] Payment lock triggered:", {
           orderUuid,

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -1087,8 +1087,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.log("[Checkout] 定金状态无变化，跳过更新");
         return;
       }
+      let deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : "0.00";
+      if (!deposit_amount) {
+        deposit_amount = this.store.currentOrder.expect_amount;
+      }
       const updateParams = {
-        is_deposit: newDepositValue
+        is_deposit: newDepositValue,
+        deposit_amount
       };
       await this.payment.updateOrderAsync(
         this.store.currentOrder.uuid,
@@ -1101,7 +1106,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (this.store.localOrderData) {
         this.store.localOrderData.is_deposit = newDepositValue;
       }
-      this.updateStateAmountToRemaining();
+      this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
         order: this.store.currentOrder,
         timestamp: Date.now()

package/package.json

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