@pisell/pisellos 0.0.293 → 0.0.295

package/dist/modules/Payment/index.js

@@ -812,35 +812,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               order = _context9.sent;
               if (!order) {
-                _context9.next = 12;
+                _context9.next = 13;
                 break;
               }
               updatedOrder = _objectSpread(_objectSpread({}, order), params);
-              _context9.next = 8;
+              this.recalculateOrderAmount(updatedOrder);
+              _context9.next = 9;
               return this.dbManager.update('order', updatedOrder);
-            case 8:
-              _context9.next = 10;
+            case 9:
+              _context9.next = 11;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, updatedOrder);
-            case 10:
-              _context9.next = 12;
+            case 11:
+              _context9.next = 13;
               return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
                 action: 'update',
                 order: updatedOrder,
                 originalOrder: order
               });
-            case 12:
-              _context9.next = 18;
+            case 13:
+              _context9.next = 19;
               break;
-            case 14:
-              _context9.prev = 14;
+            case 15:
+              _context9.prev = 15;
               _context9.t0 = _context9["catch"](0);
               console.error('[PaymentModule] 更新订单失败', _context9.t0);
               throw _context9.t0;
-            case 18:
+            case 19:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 14]]);
+        }, _callee9, this, [[0, 15]]);
       }));
       function updateOrderAsync(_x8, _x9) {
         return _updateOrderAsync.apply(this, arguments);
@@ -1065,7 +1066,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               throw new Error("Order not found: ".concat(orderUuid));
             case 7:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
-              expectAmount = new Decimal(order.expect_amount);
+              expectAmount = new Decimal(order.expect_amount); // const expecDepositAmount = new Decimal(order.deposit_amount);
               if (!expectAmount.lte(0)) {
                 _context13.next = 13;
                 break;
@@ -1807,7 +1808,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           return sum;
         }
       }, new Decimal(0));
-      var remainingAmount = totalAmount.minus(paidAmount);
+      // 如果是定金模式，则使用deposit_amount 去减已付款金额
+      var remainingAmount = order.is_deposit === 1 ? new Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
       order.expect_amount = Decimal.max(0, remainingAmount).toFixed(2);
       console.log("[PaymentModule] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:", {
         orderUuid: order.uuid,

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

@@ -637,6 +637,10 @@ export interface WalletInitBusinessData {
     amountInfo: {
         totalAmount: string;
         subTotal: string;
+        /** 是否是定金订单 */
+        isDeposit?: number;
+        /** 定金金额 */
+        depositAmount?: string;
     };
     /** 商品列表 */
     products: {

package/dist/modules/Payment/walletpass.js

@@ -73,7 +73,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         // 订单小计金额
         order_product_amount: subTotal,
         // 订单待支付金额
-        order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+        order_wait_pay_amount: order_wait_pay_amount || (amountInfo !== null && amountInfo !== void 0 && amountInfo.isDeposit ? Number(amountInfo === null || amountInfo === void 0 ? void 0 : amountInfo.depositAmount) : totalAmount),
         // order_behavior_count_customer_id: 1,
         products: products,
         prepare_payments: [],

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/BookingByStep/index.js

@@ -2601,17 +2601,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               // 这里为什么要设置个 map，因为有可能日程有重叠，所以要把重叠的 event_list 去除
               var mSet = new Map();
-              n.event_list.forEach(function (m) {
-                // 需要确认 m 的时间段是否和 item 的时间段有交集
-                if (isConflict({
-                  start_at: m.start_at,
-                  end_at: m.end_at
-                }, {
-                  start_at: dayjs(item.start),
-                  end_at: dayjs(item.end)
-                })) {
-                  mSet.set(m.id, m.pax || 1);
-                }
+              mTimes.forEach(function (n) {
+                // acc += n.event_list?.reduce((acc: any, curr: any) => acc + curr.pax, 0);
+                // mSet.set(n)
+                n.event_list.forEach(function (m) {
+                  // 需要确认 m 的时间段是否和 item 的时间段有交集
+                  if (isConflict({
+                    start_at: m.start_at,
+                    end_at: m.end_at
+                  }, {
+                    start_at: dayjs(item.start),
+                    end_at: dayjs(item.end)
+                  })) {
+                    mSet.set(m.id, m.pax || 1);
+                  }
+                });
               });
               acc += Array.from(mSet.values()).reduce(function (acc, curr) {
                 return acc + curr;

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.d.ts

@@ -56,6 +56,14 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     initWalletData(params?: {
         order_wait_pay_amount: number;
     }): Promise<void>;
+    checkIsNeedDepositAsync(bookings: any[], relationProducts: any[]): {
+        total: number;
+        protocols: {
+            id: number;
+            title: string;
+        }[];
+        hasDeposit: boolean;
+    };
     /**
      * 创建本地订单 (前端模拟下单流程)
      *