From 9b08bd8bfdf7f4b4b1cd86411862c1bf8d5b3b59 Mon Sep 17 00:00:00 2001
From: fish <zhongpengapp@hotmail.com>
Date: Sun, 26 Jul 2026 10:48:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=E4=BB=B7?=
 =?UTF-8?q?=E4=BD=8D=E5=92=8C=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 ft-app/app/models.py             | 10 +++++-----
 ft-app/app/routers/trades.py     |  8 ++++----
 ft-app/app/templates/trades.html |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ft-app/app/models.py b/ft-app/app/models.py
index d8b1018..0f00fb3 100644
--- a/ft-app/app/models.py
+++ b/ft-app/app/models.py
@@ -130,15 +130,15 @@ class Trade(Base):
     contract_code: Mapped[str] = mapped_column(String(10), index=True)
     direction: Mapped[str] = mapped_column(String(4))
     open_date: Mapped[date] = mapped_column(Date)
-    open_price: Mapped[int] = mapped_column(Integer)
-    open_fee: Mapped[int | None] = mapped_column(Integer, nullable=True, default=0)
+    open_price: Mapped[float] = mapped_column(Float)
+    open_fee: Mapped[float | None] = mapped_column(Float, nullable=True, default=0)
     close_date: Mapped[date | None] = mapped_column(Date, nullable=True)
-    close_price: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    close_fee: Mapped[int | None] = mapped_column(Integer, nullable=True, default=0)
+    close_price: Mapped[float | None] = mapped_column(Float, nullable=True)
+    close_fee: Mapped[float | None] = mapped_column(Float, nullable=True, default=0)
     status: Mapped[str] = mapped_column(String(10), default="open")
 
     @property
-    def pnl(self) -> int | None:
+    def pnl(self) -> float | None:
         if self.close_price is None:
             return None
         mul = 20  # glass futures point value
diff --git a/ft-app/app/routers/trades.py b/ft-app/app/routers/trades.py
index 73bce37..a175937 100644
--- a/ft-app/app/routers/trades.py
+++ b/ft-app/app/routers/trades.py
@@ -62,8 +62,8 @@ def open_trade(
     contract_code: str = Form(...),
     direction: str = Form(...),
     open_date: str = Form(...),
-    open_price: int = Form(...),
-    open_fee: int = Form(0),
+    open_price: float = Form(...),
+    open_fee: float = Form(0.0),
     db: Session = Depends(get_db),
 ):
     t = Trade(
@@ -85,8 +85,8 @@ def close_trade(
     request: Request,
     trade_id: int,
     close_date: str = Form(...),
-    close_price: int = Form(...),
-    close_fee: int = Form(0),
+    close_price: float = Form(...),
+    close_fee: float = Form(0.0),
     db: Session = Depends(get_db),
 ):
     t = db.query(Trade).filter(Trade.id == trade_id).first()
diff --git a/ft-app/app/templates/trades.html b/ft-app/app/templates/trades.html
index 1315bf7..7164a9f 100644
--- a/ft-app/app/templates/trades.html
+++ b/ft-app/app/templates/trades.html
@@ -42,11 +42,11 @@
       </div>
       <div class="form-group" style="margin-bottom:0;flex:0 0 auto;min-width:80px;">
         <label>开仓价</label>
-        <input type="number" name="open_price" required placeholder="1300" style="font-size:0.9rem;">
+        <input type="number" step="any" name="open_price" required placeholder="1300" style="font-size:0.9rem;">
       </div>
       <div class="form-group" style="margin-bottom:0;flex:0 0 auto;min-width:80px;">
         <label>手续费</label>
-        <input type="number" name="open_fee" value="0" style="font-size:0.9rem;">
+        <input type="number" step="any" name="open_fee" value="0" style="font-size:0.9rem;">
       </div>
       <button type="submit" class="btn btn-primary" style="font-size:0.82rem;padding:8px 18px;">开仓</button>
     </div>
@@ -100,11 +100,11 @@
     </div>
     <div class="form-group">
       <label>平仓价格</label>
-      <input type="number" name="close_price" required style="font-size:0.9rem;">
+      <input type="number" step="any" name="close_price" required style="font-size:0.9rem;">
     </div>
     <div class="form-group">
       <label>手续费</label>
-      <input type="number" name="close_fee" value="0" style="font-size:0.9rem;">
+      <input type="number" step="any" name="close_fee" value="0" style="font-size:0.9rem;">
     </div>
     <div style="display:flex;gap:10px;justify-content:flex-end;">
       <button type="button" class="btn" style="background:var(--th-bg);color:var(--fg);" onclick="hideCloseForm()">取消</button>