gavindiaz/PolyHermes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复未匹配订单更新逻辑和前端API类型定义

Browse Source 
- 修复 PositionCheckService 中未匹配订单更新逻辑，当仓位数量大于等于订单数量总和时也能正确处理
- 修复前端 API 类型定义，添加 remark 和 website 字段支持
- 添加 Leader 备注和网站字段支持
This commit is contained in:
WrBug
2025-12-07 05:07:58 +08:00
parent cb167d442f
commit 5c136ab0f4
22 changed files with 1639 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/LeaderAdd.tsx
+49 -18
View File
@@ -4,12 +4,14 @@ import { Card, Form, Input, Button, Select, message, Typography, Space } from 'a
import { ArrowLeftOutlined } from '@ant-design/icons'
import { apiService } from '../services/api'
import { useMediaQuery } from 'react-responsive'
import { useTranslation } from 'react-i18next'
import { isValidWalletAddress } from '../utils'
const { Title } = Typography
const { Option } = Select
const LeaderAdd: React.FC = () => {
const { t } = useTranslation()
const navigate = useNavigate()
const isMobile = useMediaQuery({ maxWidth: 768 })
const [form] = Form.useForm()
@@ -21,17 +23,19 @@ const LeaderAdd: React.FC = () => {
const response = await apiService.leaders.add({
leaderAddress: values.leaderAddress.trim(),
leaderName: values.leaderName?.trim() || undefined,
remark: values.remark?.trim() || undefined,
website: values.website?.trim() || undefined,
category: values.category || undefined
})
if (response.data.code === 0) {
message.success('添加 Leader 成功')
message.success(t('leaderAdd.addSuccess') || '添加 Leader 成功')
navigate('/leaders')
} else {
message.error(response.data.msg || '添加 Leader 失败')
message.error(response.data.msg || t('leaderAdd.addFailed') || '添加 Leader 失败')
}
} catch (error: any) {
message.error(error.message || '添加 Leader 失败')
message.error(error.message || t('leaderAdd.addFailed') || '添加 Leader 失败')
} finally {
setLoading(false)
}
@@ -47,7 +51,7 @@ const LeaderAdd: React.FC = () => {
>
返回
</Button>
<Title level={2} style={{ margin: 0 }}>添加 Leader</Title>
<Title level={2} style={{ margin: 0 }}>{t('leaderAdd.title') || '添加 Leader'}</Title>
</div>
<Card>
@@ -61,41 +65,68 @@ const LeaderAdd: React.FC = () => {
}}
>
<Form.Item
label="Leader 钱包地址"
label={t('leaderAdd.leaderAddress') || 'Leader 钱包地址'}
name="leaderAddress"
rules={[
{ required: true, message: '请输入 Leader 钱包地址' },
{ required: true, message: t('leaderAdd.leaderAddressRequired') || '请输入 Leader 钱包地址' },
{
validator: (_, value) => {
if (!value) {
return Promise.reject(new Error('请输入 Leader 钱包地址'))
return Promise.reject(new Error(t('leaderAdd.leaderAddressRequired') || '请输入 Leader 钱包地址'))
}
if (!isValidWalletAddress(value.trim())) {
return Promise.reject(new Error('钱包地址格式不正确（必须是 0x 开头的 42 位地址）'))
return Promise.reject(new Error(t('leaderAdd.leaderAddressInvalid') || '钱包地址格式不正确（必须是 0x 开头的 42 位地址）'))
}
return Promise.resolve()
}
}
]}
tooltip="被跟单者的钱包地址，系统将监控该地址的交易并自动跟单"
tooltip={t('leaderAdd.leaderAddressTooltip') || '被跟单者的钱包地址，系统将监控该地址的交易并自动跟单'}
>
<Input placeholder="0x..." style={{ fontFamily: 'monospace' }} />
</Form.Item>
<Form.Item
label="Leader 名称"
label={t('leaderAdd.leaderName') || 'Leader 名称'}
name="leaderName"
tooltip="可选，用于标识 Leader，方便管理"
tooltip={t('leaderAdd.leaderNameTooltip') || '可选，用于标识 Leader，方便管理'}
>
<Input placeholder="可选，用于标识 Leader" />
<Input placeholder={t('leaderAdd.leaderNamePlaceholder') || '可选，用于标识 Leader'} />
</Form.Item>
<Form.Item
label="分类筛选"
name="category"
tooltip="仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）"
label={t('leaderAdd.remark') || 'Leader 备注'}
name="remark"
tooltip={t('leaderAdd.remarkTooltip') || '可选，用于记录 Leader 的备注信息'}
>
<Select placeholder="选择分类（可选）" allowClear>
<Input.TextArea
placeholder={t('leaderAdd.remarkPlaceholder') || '可选，用于记录 Leader 的备注信息'}
rows={3}
maxLength={500}
showCount
/>
</Form.Item>
<Form.Item
label={t('leaderAdd.website') || 'Leader 网站'}
name="website"
tooltip={t('leaderAdd.websiteTooltip') || '可选，Leader 的网站链接'}
rules={[
{
type: 'url',
message: t('leaderAdd.websiteInvalid') || '请输入有效的 URL 地址'
}
]}
>
<Input placeholder={t('leaderAdd.websitePlaceholder') || '可选，例如：https://example.com'} />
</Form.Item>
<Form.Item
label={t('leaderAdd.category') || '分类筛选'}
name="category"
tooltip={t('leaderAdd.categoryTooltip') || '仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）'}
>
<Select placeholder={t('leaderAdd.categoryPlaceholder') || '选择分类（可选）'} allowClear>
<Option value="sports">Sports</Option>
<Option value="crypto">Crypto</Option>
</Select>
@@ -109,10 +140,10 @@ const LeaderAdd: React.FC = () => {
loading={loading}
size={isMobile ? 'middle' : 'large'}
>
添加 Leader
{t('leaderAdd.add') || '添加 Leader'}
</Button>
<Button onClick={() => navigate('/leaders')}>
取消
{t('leaderAdd.cancel') || '取消'}
</Button>
</Space>
</Form.Item>
frontend/src/pages/LeaderEdit.tsx
+50 -17
View File
@@ -4,12 +4,14 @@ import { Card, Form, Input, Button, Select, message, Typography, Space, Spin } f
import { ArrowLeftOutlined } from '@ant-design/icons'
import { apiService } from '../services/api'
import { useMediaQuery } from 'react-responsive'
import { useTranslation } from 'react-i18next'
import type { Leader } from '../types'
const { Title } = Typography
const { Option } = Select
const LeaderEdit: React.FC = () => {
const { t } = useTranslation()
const navigate = useNavigate()
const [searchParams] = useSearchParams()
const isMobile = useMediaQuery({ maxWidth: 768 })
@@ -22,7 +24,7 @@ const LeaderEdit: React.FC = () => {
if (leaderId) {
fetchLeaderDetail(parseInt(leaderId))
} else {
message.error('Leader ID 无效')
message.error(t('leaderEdit.invalidId') || 'Leader ID 无效')
navigate('/leaders')
}
}, [leaderId, navigate])
@@ -35,14 +37,16 @@ const LeaderEdit: React.FC = () => {
const leader: Leader = response.data.data
form.setFieldsValue({
leaderName: leader.leaderName || '',
remark: leader.remark || '',
website: leader.website || '',
category: leader.category || undefined
})
} else {
message.error(response.data.msg || '获取 Leader 详情失败')
message.error(response.data.msg || t('leaderEdit.fetchFailed') || '获取 Leader 详情失败')
navigate('/leaders')
}
} catch (error: any) {
message.error(error.message || '获取 Leader 详情失败')
message.error(error.message || t('leaderEdit.fetchFailed') || '获取 Leader 详情失败')
navigate('/leaders')
} finally {
setFetching(false)
@@ -51,7 +55,7 @@ const LeaderEdit: React.FC = () => {
const handleSubmit = async (values: any) => {
if (!leaderId) {
message.error('Leader ID 无效')
message.error(t('leaderEdit.invalidId') || 'Leader ID 无效')
return
}
@@ -60,17 +64,19 @@ const LeaderEdit: React.FC = () => {
const response = await apiService.leaders.update({
leaderId: parseInt(leaderId),
leaderName: values.leaderName?.trim() || undefined,
remark: values.remark?.trim() || undefined,
website: values.website?.trim() || undefined,
category: values.category || undefined
})
if (response.data.code === 0) {
message.success('更新 Leader 成功')
message.success(t('leaderEdit.saveSuccess') || '更新 Leader 成功')
navigate('/leaders')
} else {
message.error(response.data.msg || '更新 Leader 失败')
message.error(response.data.msg || t('leaderEdit.saveFailed') || '更新 Leader 失败')
}
} catch (error: any) {
message.error(error.message || '更新 Leader 失败')
message.error(error.message || t('leaderEdit.saveFailed') || '更新 Leader 失败')
} finally {
setLoading(false)
}
@@ -94,7 +100,7 @@ const LeaderEdit: React.FC = () => {
>
返回
</Button>
<Title level={2} style={{ margin: 0 }}>编辑 Leader</Title>
<Title level={2} style={{ margin: 0 }}>{t('leaderEdit.title') || '编辑 Leader'}</Title>
</div>
<Card>
@@ -105,19 +111,46 @@ const LeaderEdit: React.FC = () => {
size={isMobile ? 'middle' : 'large'}
>
<Form.Item
label="Leader 名称"
label={t('leaderEdit.leaderName') || 'Leader 名称'}
name="leaderName"
tooltip="可选，用于标识 Leader，方便管理"
tooltip={t('leaderEdit.leaderNameTooltip') || '可选，用于标识 Leader，方便管理'}
>
<Input placeholder="可选，用于标识 Leader" />
<Input placeholder={t('leaderEdit.leaderNamePlaceholder') || '可选，用于标识 Leader'} />
</Form.Item>
<Form.Item
label="分类筛选"
name="category"
tooltip="仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）"
label={t('leaderEdit.remark') || 'Leader 备注'}
name="remark"
tooltip={t('leaderEdit.remarkTooltip') || '可选，用于记录 Leader 的备注信息'}
>
<Select placeholder="选择分类（可选）" allowClear>
<Input.TextArea
placeholder={t('leaderEdit.remarkPlaceholder') || '可选，用于记录 Leader 的备注信息'}
rows={3}
maxLength={500}
showCount
/>
</Form.Item>
<Form.Item
label={t('leaderEdit.website') || 'Leader 网站'}
name="website"
tooltip={t('leaderEdit.websiteTooltip') || '可选，Leader 的网站链接'}
rules={[
{
type: 'url',
message: t('leaderEdit.websiteInvalid') || '请输入有效的 URL 地址'
}
]}
>
<Input placeholder={t('leaderEdit.websitePlaceholder') || '可选，例如：https://example.com'} />
</Form.Item>
<Form.Item
label={t('leaderEdit.category') || '分类筛选'}
name="category"
tooltip={t('leaderEdit.categoryTooltip') || '仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）'}
>
<Select placeholder={t('leaderEdit.categoryPlaceholder') || '选择分类（可选）'} allowClear>
<Option value="sports">Sports</Option>
<Option value="crypto">Crypto</Option>
</Select>
@@ -131,10 +164,10 @@ const LeaderEdit: React.FC = () => {
loading={loading}
size={isMobile ? 'middle' : 'large'}
>
保存
{t('leaderEdit.save') || '保存'}
</Button>
<Button onClick={() => navigate('/leaders')}>
取消
{t('leaderEdit.cancel') || '取消'}
</Button>
</Space>
</Form.Item>
frontend/src/pages/LeaderList.tsx
+69 -7
View File
@@ -1,12 +1,14 @@
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { Card, Table, Button, Space, Tag, Popconfirm, message, List, Empty, Spin, Divider } from 'antd'
import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons'
import { Card, Table, Button, Space, Tag, Popconfirm, message, List, Empty, Spin, Divider, Typography } from 'antd'
import { PlusOutlined, EditOutlined, DeleteOutlined, LinkOutlined, GlobalOutlined } from '@ant-design/icons'
import { useTranslation } from 'react-i18next'
import { apiService } from '../services/api'
import type { Leader } from '../types'
import { useMediaQuery } from 'react-responsive'
const { Text } = Typography
const LeaderList: React.FC = () => {
const { t, i18n } = useTranslation()
const navigate = useNavigate()
@@ -73,6 +75,16 @@ const LeaderList: React.FC = () => {
<Tag color={category === 'sports' ? 'blue' : 'green'}>{category}</Tag>
) : <Tag>{t('leaderList.all') || '全部'}</Tag>
},
{
title: t('leaderList.remark') || '备注',
dataIndex: 'remark',
key: 'remark',
render: (remark: string | undefined) => remark ? (
<Text ellipsis={{ tooltip: remark }} style={{ maxWidth: isMobile ? 100 : 200 }}>
{remark}
</Text>
) : <Text type="secondary">-</Text>
},
{
title: t('leaderList.copyTradingCount') || '跟单关系数',
dataIndex: 'copyTradingCount',
@@ -97,9 +109,19 @@ const LeaderList: React.FC = () => {
{
title: t('common.actions') || '操作',
key: 'action',
width: isMobile ? 120 : 150,
width: isMobile ? 150 : 200,
render: (_: any, record: Leader) => (
<Space size="small">
<Space size="small" wrap>
{record.website && (
<Button
type="link"
size="small"
icon={<GlobalOutlined />}
onClick={() => window.open(record.website, '_blank', 'noopener,noreferrer')}
>
{t('leaderList.openWebsite') || '打开网页'}
</Button>
)}
<Button
type="link"
size="small"
@@ -199,6 +221,35 @@ const LeaderList: React.FC = () => {
</div>
</div>
{/* 备注 */}
{leader.remark && (
<div style={{ marginBottom: '12px' }}>
<Text type="secondary" style={{ fontSize: '12px' }}>
{t('leaderList.remark') || '备注'}：
</Text>
<Text style={{ fontSize: '12px', marginLeft: '4px' }}>
{leader.remark}
</Text>
</div>
)}
{/* 网站 */}
{leader.website && (
<div style={{ marginBottom: '12px' }}>
<Text type="secondary" style={{ fontSize: '12px' }}>
{t('leaderList.website') || '网站'}：
</Text>
<a
href={leader.website}
target="_blank"
rel="noopener noreferrer"
style={{ fontSize: '12px', marginLeft: '4px' }}
>
<LinkOutlined /> {leader.website}
</a>
</div>
)}
<Divider style={{ margin: '12px 0' }} />
{/* 分类和跟单关系数 */}
@@ -221,13 +272,24 @@ const LeaderList: React.FC = () => {
</div>
{/* 操作按钮 */}
<div style={{ display: 'flex', gap: '8px' }}>
<div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>
{leader.website && (
<Button
type="link"
size="small"
icon={<GlobalOutlined />}
onClick={() => window.open(leader.website, '_blank', 'noopener,noreferrer')}
style={{ flex: 1, minWidth: '80px' }}
>
{t('leaderList.openWebsite') || '打开网页'}
</Button>
)}
<Button
type="link"
size="small"
icon={<EditOutlined />}
onClick={() => navigate(`/leaders/edit?id=${leader.id}`)}
style={{ flex: 1 }}
style={{ flex: 1, minWidth: '80px' }}
>
{t('common.edit') || '编辑'}
</Button>
@@ -243,7 +305,7 @@ const LeaderList: React.FC = () => {
size="small"
danger
icon={<DeleteOutlined />}
style={{ flex: 1 }}
style={{ flex: 1, minWidth: '80px' }}
>
{t('common.delete') || '删除'}
</Button>
frontend/src/pages/SystemSettings.tsx
+701 -303
View File
File diff suppressed because it is too large Load Diff