From cd24e88f6080b8c3d299b61e598345c01987c754 Mon Sep 17 00:00:00 2001
From: admin <admin@viaeon.com>
Date: Thu, 28 May 2026 00:12:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BepUsdt=E8=AF=B7=E6=B1=82=E4=BD=93amount?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAfloat64=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/internal/api/handlers/payment.go | 21 +++++++++++++++++++--
 frontend/src/views/admin/Orders.vue      | 14 +++++++-------
 frontend/src/views/user/Orders.vue       | 12 ++++++------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/backend/internal/api/handlers/payment.go b/backend/internal/api/handlers/payment.go
index 2daf80c..ee8f00a 100644
--- a/backend/internal/api/handlers/payment.go
+++ b/backend/internal/api/handlers/payment.go
@@ -25,6 +25,15 @@ func NewPaymentHandler() *PaymentHandler {
 	return &PaymentHandler{}
 }
 
+type BepUsdtCreateRequest struct {
+	TradeType   string  `json:"trade_type,omitempty"`
+	OrderID     string  `json:"order_id"`
+	Amount      float64 `json:"amount"`
+	NotifyURL   string  `json:"notify_url"`
+	RedirectURL string  `json:"redirect_url,omitempty"`
+	Signature   string  `json:"signature"`
+}
+
 func (h *PaymentHandler) CreatePayment(c *gin.Context) {
 	userID := c.GetUint("user_id")
 	orderID, _ := strconv.Atoi(c.Param("id"))
@@ -78,12 +87,20 @@ func (h *PaymentHandler) CreatePayment(c *gin.Context) {
 	}
 
 	signature := signBepUsdt(params, apiToken)
-	params["signature"] = signature
 
 	log.Printf("[BepUsdt] signature params: %v", params)
 	log.Printf("[BepUsdt] signature: %s, token: %s", signature, apiToken)
 
-	body, _ := json.Marshal(params)
+	reqBody := BepUsdtCreateRequest{
+		TradeType:   tradeType,
+		OrderID:     strconv.Itoa(int(order.ID)),
+		Amount:      order.TotalAmount,
+		NotifyURL:   notifyURL,
+		RedirectURL: redirectURL,
+		Signature:   signature,
+	}
+
+	body, _ := json.Marshal(reqBody)
 	log.Printf("[BepUsdt] request body: %s", string(body))
 
 	req, err := http.NewRequest("POST", apiURL+"/api/v1/order/create-transaction", strings.NewReader(string(body)))
diff --git a/frontend/src/views/admin/Orders.vue b/frontend/src/views/admin/Orders.vue
index c21b6c9..d7fbc6b 100644
--- a/frontend/src/views/admin/Orders.vue
+++ b/frontend/src/views/admin/Orders.vue
@@ -5,15 +5,15 @@
     </div>
     <div class="table-card">
       <el-table :data="paginatedOrders" style="width: 100%">
-        <el-table-column prop="id" label="ID" width="80" />
-        <el-table-column prop="user.username" label="用户" min-width="120" />
-        <el-table-column prop="total_amount" label="金额" width="100"><template #default="{ row }">¥{{ row.total_amount }}</template></el-table-column>
-        <el-table-column prop="status" label="状态" width="120"><template #default="{ row }"><el-tag>{{ statusText(row.status) }}</el-tag></template></el-table-column>
-        <el-table-column prop="refund_status" label="退款" width="100"><template #default="{ row }"><el-tag v-if="row.refund_status" type="warning">{{ row.refund_status }}</el-tag></template></el-table-column>
-        <el-table-column label="创建时间" width="180">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="user.username" label="用户" min-width="100" />
+        <el-table-column prop="total_amount" label="金额" min-width="100"><template #default="{ row }">¥{{ row.total_amount }}</template></el-table-column>
+        <el-table-column prop="status" label="状态" min-width="100"><template #default="{ row }"><el-tag>{{ statusText(row.status) }}</el-tag></template></el-table-column>
+        <el-table-column prop="refund_status" label="退款" min-width="80"><template #default="{ row }"><el-tag v-if="row.refund_status" type="warning">{{ row.refund_status }}</el-tag></template></el-table-column>
+        <el-table-column label="创建时间" min-width="160">
           <template #default="{ row }">{{ formatDate(row.created_at) }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" width="150" fixed="right">
           <template #default="{ row }">
             <el-button v-if="row.refund_status === 'pending'" link type="primary" size="small" @click="processRefund(row.id, 'approved')">批准</el-button>
             <el-button v-if="row.refund_status === 'pending'" link type="danger" size="small" @click="processRefund(row.id, 'rejected')">拒绝</el-button>
diff --git a/frontend/src/views/user/Orders.vue b/frontend/src/views/user/Orders.vue
index bd2525d..c9c2a1b 100644
--- a/frontend/src/views/user/Orders.vue
+++ b/frontend/src/views/user/Orders.vue
@@ -2,20 +2,20 @@
   <div class="orders-page">
     <BackNav />
     <div class="table-card">
-      <el-table :data="orders">
-        <el-table-column prop="id" label="ID" width="80" />
-        <el-table-column prop="total_amount" :label="$t('order.totalAmount')" width="120">
+      <el-table :data="orders" style="width: 100%">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="total_amount" :label="$t('order.totalAmount')" min-width="100">
           <template #default="{ row }">¥{{ row.total_amount }}</template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" width="120">
+        <el-table-column prop="status" :label="$t('order.status')" min-width="100">
           <template #default="{ row }">
             <el-tag :type="statusType(row.status)">{{ statusText(row.status) }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" width="180">
+        <el-table-column label="创建时间" min-width="160">
           <template #default="{ row }">{{ formatDate(row.created_at) }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="200" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" size="small" @click="$router.push(`/orders/${row.id}`)">查看</el-button>
             <el-button v-if="row.status === 'pending_payment'" link type="success" size="small" @click="goPay(row)">去支付</el-button>