xiaoquan/rent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev

Browse Source
This commit is contained in:
xiaoquan
2026-04-24 00:28:52 +08:00
parent 6be9d4afb7
commit 524ff8cd32
27 changed files with 568 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/merchant-admin/src/pages/finance/Wallet.tsx
+1 -1
View File
@@ -138,7 +138,7 @@ const Wallet: React.FC = () => {
</Form.Item>
</Form>
<div style={{ fontSize: 12, color: '#999' }}>
手续费率 0.6%，实际到账 = 提现金额 - 手续费
无手续费，实际到账 = 提现金额
</div>
</Modal>
apps/merchant-admin/src/pages/finance/Withdrawals.tsx
-1
View File
@@ -34,7 +34,6 @@ const Withdrawals: React.FC = () => {
const columns: ColumnsType<any> = [
{ title: '提现金额', dataIndex: 'amount', width: 120, render: (v) => `¥${Number(v).toFixed(2)}` },
{ title: '手续费', dataIndex: 'fee', width: 100, render: (v) => `¥${Number(v).toFixed(2)}` },
{ title: '实际到账', dataIndex: 'actualAmount', width: 120, render: (v) => <span style={{ color: '#FF6B35', fontWeight: 600 }}>¥{Number(v).toFixed(2)}</span> },
{ title: '开户银行', dataIndex: 'bankName', width: 120 },
{ title: '银行账号', dataIndex: 'bankAccount', width: 160 },
apps/miniapp/src/pages/seller/order-detail.vue
+12
View File
@@ -70,6 +70,14 @@
<text class="info-label">优惠券</text>
<text class="info-value discount">-¥{{ order.couponDiscount }}</text>
</view>
<view class="info-row flex-between">
<text class="info-label">软件服务费</text>
<text class="info-value service-fee">-¥{{ order.serviceFee || 0 }}</text>
</view>
<view class="info-row flex-between">
<text class="info-label">预计收入</text>
<text class="info-value merchant-income">¥{{ order.merchantIncome || order.payAmount }}</text>
</view>
<view class="info-row flex-between total-row">
<text class="info-label">实付金额</text>
<text class="total-price">¥{{ order.payAmount }}</text>
@@ -340,6 +348,10 @@ async function submitReject() {
.discount { color: #52c41a; }
.service-fee { color: #faad14; }
.merchant-income { color: #1890ff; font-weight: 600; }
.total-row {
padding-top: 20rpx;
border-top: 2rpx solid #eee;
apps/platform-admin/src/App.tsx
+2 -7
View File
@@ -15,8 +15,7 @@ import SystemSettings from '@/pages/SystemSettings';
import FinanceSettlements from '@/pages/finance/Settlements';
import FinanceWithdrawals from '@/pages/finance/Withdrawals';
import FinanceEarnings from '@/pages/finance/Earnings';
import ActivityList from '@/pages/activity/ActivityList';
import ActivityDetail from '@/pages/activity/ActivityDetail';
import InviteManage from '@/pages/InviteManage';
const ProtectedRoute: React.FC<{ children: React.ReactNode }> = ({ children }) => {
const token = localStorage.getItem('admin_token');
@@ -43,11 +42,7 @@ const App: React.FC = () => (
<Route path="withdrawals" element={<FinanceWithdrawals />} />
<Route path="earnings" element={<FinanceEarnings />} />
</Route>
<Route path="activity">
<Route index element={<Navigate to="/activity/list" replace />} />
<Route path="list" element={<ActivityList />} />
<Route path="detail/:id" element={<ActivityDetail />} />
</Route>
<Route path="invite" element={<InviteManage />} />
<Route path="promotions" element={<Promotion />} />
<Route path="settings" element={<SystemSettings />} />
</Route>
apps/platform-admin/src/api/config.ts
+5
View File
@@ -0,0 +1,5 @@
import request from '@/utils/request';
export const getServiceFeeConfig = () => request.get('/admin/config/service-fee');
export const updateServiceFeeConfig = (rate: number) => request.put('/admin/config/service-fee', { rate });
apps/platform-admin/src/api/activity.ts → apps/platform-admin/src/api/invite.ts
+15 -20
View File
@@ -1,25 +1,5 @@
import request from '@/utils/request';
// 活动列表
export const getActivities = (params?: { page?: number; pageSize?: number; type?: string; enabled?: boolean }) =>
request.get('/admin/activity/list', { params });
// 活动详情
export const getActivityById = (id: number) =>
request.get(`/admin/activity/${id}`);
// 创建活动
export const createActivity = (data: any) =>
request.post('/admin/activity/create', data);
// 编辑活动
export const updateActivity = (id: number, data: any) =>
request.put(`/admin/activity/${id}/update`, data);
// 启用/停用活动
export const toggleActivity = (id: number) =>
request.put(`/admin/activity/${id}/toggle`);
// 邀请数据总览
export const getInviteStats = () =>
request.get('/admin/activity/invite/stats');
@@ -47,3 +27,18 @@ export const rejectInviteWithdrawal = (id: number, reason: string) =>
// 确认打款
export const payInviteWithdrawal = (id: number) =>
request.put(`/admin/activity/invite/withdrawals/${id}/pay`);
// 获取邀请活动配置
export const getInviteConfig = () =>
request.get('/admin/activity/invite/config');
// 更新邀请活动配置
export const updateInviteConfig = (data: {
firstOrderRate?: number;
secondOrderRate?: number;
minCashback?: number;
maxCashback?: number;
withdrawThreshold?: number;
enabled?: boolean;
}) =>
request.put('/admin/activity/invite/config', data);
apps/platform-admin/src/layouts/MainLayout.tsx
+1 -11
View File
@@ -15,8 +15,6 @@ import {
AuditOutlined,
PayCircleOutlined,
FundOutlined,
RocketOutlined,
OrderedListOutlined,
TrophyOutlined,
} from '@ant-design/icons';
import { useAuthStore } from '@/store/auth';
@@ -39,14 +37,7 @@ const menuItems = [
{ key: '/finance/earnings', icon: <FundOutlined />, label: '平台收益' },
],
},
{
key: '/activity',
icon: <RocketOutlined />,
label: '活动管理',
children: [
{ key: '/activity/list', icon: <GiftOutlined />, label: '活动列表' },
],
},
{ key: '/invite', icon: <TrophyOutlined />, label: '邀请返现' },
{ key: '/promotions', icon: <GiftOutlined />, label: '推广管理' },
{ key: '/settings', icon: <SettingOutlined />, label: '系统设置' },
];
@@ -59,7 +50,6 @@ const MainLayout: React.FC = () => {
const openKeys = useMemo(() => {
const path = location.pathname;
if (path.startsWith('/finance')) return ['/finance'];
if (path.startsWith('/activity')) return ['/activity'];
return [];
}, [location.pathname]);
apps/platform-admin/src/pages/activity/ActivityDetail.tsx → apps/platform-admin/src/pages/InviteManage.tsx
+111 -104
View File
@@ -1,22 +1,13 @@
import React, { useEffect, useState } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { Card, Descriptions, Tag, Button, Tabs, Table, Modal, Input, Space, message, Statistic, Row, Col } from 'antd';
import { Card, Tabs, Table, Tag, Button, Modal, Input, Space, message, Statistic, Row, Col, Switch, Form, InputNumber } from 'antd';
import {
getActivityById, createActivity, updateActivity,
getInviteStats, getInviteRecords, getCashbackRecords,
getInviteWithdrawals, approveInviteWithdrawal, rejectInviteWithdrawal, payInviteWithdrawal,
} from '@/api/activity';
getInviteConfig, updateInviteConfig,
} from '@/api/invite';
import dayjs from 'dayjs';
const ActivityDetail: React.FC = () => {
const { id } = useParams<{ id: string }>();
const navigate = useNavigate();
const isCreate = id === 'create';
const [activity, setActivity] = useState<any>(null);
const [loading, setLoading] = useState(!isCreate);
// 邀请返现数据
const InviteManage: React.FC = () => {
const [stats, setStats] = useState<any>({});
const [invitations, setInvitations] = useState<any[]>([]);
const [invTotal, setInvTotal] = useState(0);
@@ -37,59 +28,70 @@ const ActivityDetail: React.FC = () => {
const [currentWdId, setCurrentWdId] = useState<number | null>(null);
const [rejectReason, setRejectReason] = useState('');
const fetchActivity = async () => {
if (isCreate) return;
setLoading(true);
const [config, setConfig] = useState<any>(null);
const [configLoading, setConfigLoading] = useState(false);
const [form] = Form.useForm();
const fetchStats = async () => {
try {
const res = await getActivityById(Number(id));
setActivity(res.data);
const res = await getInviteStats();
setStats(res.data || {});
} catch {}
};
const fetchInvitations = async () => {
setInvLoading(true);
try {
const res = await getInviteRecords({ page: invPage, pageSize: 10 });
setInvitations(res.data?.list || []);
setInvTotal(res.data?.total || 0);
} finally {
setLoading(false);
setInvLoading(false);
}
};
const fetchInviteData = async () => {
const fetchCashbacks = async () => {
setCbLoading(true);
try {
const [statsRes, invRes, cbRes, wdRes] = await Promise.all([
getInviteStats(),
getInviteRecords({ page: invPage, pageSize: 10 }),
getCashbackRecords({ page: cbPage, pageSize: 10 }),
getInviteWithdrawals({ page: wdPage, pageSize: 10 }),
]);
setStats(statsRes.data || {});
setInvitations(invRes.data?.list || []);
setInvTotal(invRes.data?.total || 0);
setCashbacks(cbRes.data?.list || []);
setCbTotal(cbRes.data?.total || 0);
setWithdrawals(wdRes.data?.list || []);
setWdTotal(wdRes.data?.total || 0);
} catch {}
const res = await getCashbackRecords({ page: cbPage, pageSize: 10 });
setCashbacks(res.data?.list || []);
setCbTotal(res.data?.total || 0);
} finally {
setCbLoading(false);
}
};
useEffect(() => { fetchActivity(); }, [id]);
useEffect(() => {
if (!isCreate && activity?.type === 'invite_cashback') fetchInviteData();
}, [activity, invPage, cbPage, wdPage]);
// 创建固定活动
const handleCreate = async (type: string) => {
const typeMap: Record<string, { name: string; config: any }> = {
invite_cashback: {
name: '邀请返现',
config: { firstOrderRate: 0.05, secondOrderRate: 0.005, minCashback: 0.01, maxCashback: 50, withdrawThreshold: 10 },
},
};
const preset = typeMap[type];
if (!preset) return;
const fetchWithdrawals = async () => {
setWdLoading(true);
try {
await createActivity({ name: preset.name, type, enabled: true, config: preset.config });
message.success('创建成功');
navigate('/activity/list');
} catch {}
const res = await getInviteWithdrawals({ page: wdPage, pageSize: 10 });
setWithdrawals(res.data?.list || []);
setWdTotal(res.data?.total || 0);
} finally {
setWdLoading(false);
}
};
const fetchConfig = async () => {
setConfigLoading(true);
try {
const res = await getInviteConfig();
setConfig(res.data);
if (res.data) {
form.setFieldsValue(res.data);
}
} finally {
setConfigLoading(false);
}
};
useEffect(() => { fetchStats(); fetchConfig(); }, []);
useEffect(() => { fetchInvitations(); }, [invPage]);
useEffect(() => { fetchCashbacks(); }, [cbPage]);
useEffect(() => { fetchWithdrawals(); }, [wdPage]);
const handleApprove = async (wid: number) => {
try { await approveInviteWithdrawal(wid); message.success('审核通过'); fetchInviteData(); } catch {}
try { await approveInviteWithdrawal(wid); message.success('审核通过'); fetchWithdrawals(); fetchStats(); } catch {}
};
const handleReject = async () => {
@@ -99,31 +101,31 @@ const ActivityDetail: React.FC = () => {
message.success('已拒绝');
setRejectModalOpen(false);
setRejectReason('');
fetchInviteData();
fetchWithdrawals();
fetchStats();
} catch {}
};
const handlePay = async (wid: number) => {
try { await payInviteWithdrawal(wid); message.success('已确认打款'); fetchInviteData(); } catch {}
try { await payInviteWithdrawal(wid); message.success('已确认打款'); fetchWithdrawals(); fetchStats(); } catch {}
};
if (isCreate) {
return (
<Card title="创建活动">
<div style={{ display: 'flex', gap: 24 }}>
<Card hoverable style={{ width: 300 }} onClick={() => handleCreate('invite_cashback')}>
<Card.Meta title="邀请返现" description="邀请好友下单，邀请人获得返现奖励。首单5%，二单0.5%。" />
</Card>
</div>
<div style={{ marginTop: 24 }}>
<Button onClick={() => navigate('/activity/list')}>返回列表</Button>
</div>
</Card>
);
}
const handleToggle = async (enabled: boolean) => {
try {
await updateInviteConfig({ enabled });
setConfig({ ...config, enabled });
message.success(enabled ? '已启用' : '已停用');
} catch {}
};
if (loading) return <Card loading />;
if (!activity) return <Card>活动不存在</Card>;
const handleSaveConfig = async () => {
try {
const values = await form.validateFields();
await updateInviteConfig(values);
message.success('配置已保存');
setConfig({ ...config, ...values });
} catch {}
};
const invColumns = [
{ title: 'ID', dataIndex: 'id', width: 60 },
@@ -181,34 +183,7 @@ const ActivityDetail: React.FC = () => {
const tabItems = [
{
key: 'info',
label: '活动信息',
children: (
<Descriptions column={2} bordered>
<Descriptions.Item label="活动名称">{activity.name}</Descriptions.Item>
<Descriptions.Item label="活动类型">邀请返现</Descriptions.Item>
<Descriptions.Item label="状态">
<Tag color={activity.enabled ? 'green' : 'default'}>{activity.enabled ? '启用' : '停用'}</Tag>
</Descriptions.Item>
<Descriptions.Item label="活动时间">
{activity.startTime
? `${dayjs(activity.startTime).format('YYYY-MM-DD')} ~ ${dayjs(activity.endTime).format('YYYY-MM-DD')}`
: '不限'}
</Descriptions.Item>
{activity.config && (
<>
<Descriptions.Item label="首单返现比例">{(activity.config.firstOrderRate * 100).toFixed(1)}%</Descriptions.Item>
<Descriptions.Item label="二单返现比例">{(activity.config.secondOrderRate * 100).toFixed(1)}%</Descriptions.Item>
<Descriptions.Item label="最低返现">¥{activity.config.minCashback}</Descriptions.Item>
<Descriptions.Item label="最高返现">¥{activity.config.maxCashback}</Descriptions.Item>
<Descriptions.Item label="提现门槛">¥{activity.config.withdrawThreshold}</Descriptions.Item>
</>
)}
</Descriptions>
),
},
{
key: 'stats',
key: 'overview',
label: '数据概览',
children: (
<div>
@@ -238,13 +213,45 @@ const ActivityDetail: React.FC = () => {
pagination={{ current: wdPage, total: wdTotal, pageSize: 10, onChange: setWdPage }} />
),
},
{
key: 'config',
label: '活动配置',
children: (
<Card loading={configLoading}>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 24 }}>
<span style={{ fontSize: 16, fontWeight: 600 }}>邀请返现活动</span>
<Switch checked={config?.enabled} onChange={handleToggle} checkedChildren="启用" unCheckedChildren="停用" />
</div>
<Form form={form} layout="vertical" style={{ maxWidth: 500 }}>
<Form.Item label="首单返现比例" name="firstOrderRate" rules={[{ required: true }]}>
<InputNumber min={0} max={1} step={0.01} addonAfter="%" style={{ width: '100%' }}
formatter={v => `${(Number(v) * 100).toFixed(1)}`} parser={v => Number(v?.replace('%', '')) / 100} />
</Form.Item>
<Form.Item label="二单返现比例" name="secondOrderRate" rules={[{ required: true }]}>
<InputNumber min={0} max={1} step={0.001} addonAfter="%" style={{ width: '100%' }}
formatter={v => `${(Number(v) * 100).toFixed(1)}`} parser={v => Number(v?.replace('%', '')) / 100} />
</Form.Item>
<Form.Item label="最低返现金额" name="minCashback" rules={[{ required: true }]}>
<InputNumber min={0} step={0.01} prefix="¥" style={{ width: '100%' }} />
</Form.Item>
<Form.Item label="最高返现金额" name="maxCashback" rules={[{ required: true }]}>
<InputNumber min={0} step={1} prefix="¥" style={{ width: '100%' }} />
</Form.Item>
<Form.Item label="提现门槛" name="withdrawThreshold" rules={[{ required: true }]}>
<InputNumber min={0} step={1} prefix="¥" style={{ width: '100%' }} />
</Form.Item>
<Form.Item>
<Button type="primary" onClick={handleSaveConfig}>保存配置</Button>
</Form.Item>
</Form>
</Card>
),
},
];
return (
<div>
<div style={{ marginBottom: 16 }}>
<Button onClick={() => navigate('/activity/list')}>返回列表</Button>
</div>
<h2 style={{ marginBottom: 16 }}>邀请返现管理</h2>
<Card>
<Tabs items={tabItems} />
</Card>
@@ -255,4 +262,4 @@ const ActivityDetail: React.FC = () => {
);
};
export default ActivityDetail;
export default InviteManage;
apps/platform-admin/src/pages/SystemSettings.tsx
+86 -9
View File
@@ -1,11 +1,88 @@
import React from 'react';
import { Empty } from 'antd';
import React, { useEffect, useState } from 'react';
import { Card, Form, InputNumber, Button, message, Spin, Divider } from 'antd';
import { getServiceFeeConfig, updateServiceFeeConfig } from '@/api/config';
const SystemSettings: React.FC = () => (
<div>
<h2 style={{ marginBottom: 24 }}>系统设置</h2>
<Empty description="系统设置功能开发中" />
</div>
);
const SystemSettings: React.FC = () => {
const [loading, setLoading] = useState(false);
const [saving, setSaving] = useState(false);
const [form] = Form.useForm();
export default SystemSettings;
const fetchConfig = async () => {
setLoading(true);
try {
const res: any = await getServiceFeeConfig();
form.setFieldsValue({ serviceFeeRate: res.data?.rate || 0.05 });
} catch (e) {
form.setFieldsValue({ serviceFeeRate: 0.05 });
} finally {
setLoading(false);
}
};
useEffect(() => { fetchConfig(); }, []);
const handleSave = async () => {
try {
const values = await form.validateFields();
setSaving(true);
await updateServiceFeeConfig(values.serviceFeeRate);
message.success('服务费配置已保存');
fetchConfig();
} catch (e: any) {
if (e?.message) message.error(e.message);
} finally {
setSaving(false);
}
};
if (loading) return <Spin size="large" style={{ display: 'block', marginTop: 100 }} />;
return (
<div>
<h2 style={{ marginBottom: 24 }}>系统设置</h2>
<Card title="服务费配置" style={{ maxWidth: 600 }}>
<Form form={form} layout="vertical">
<Form.Item
label="软件服务费比例"
name="serviceFeeRate"
rules={[
{ required: true, message: '请输入服务费比例' },
{ type: 'number', min: 0, max: 1, message: '比例必须在0-1之间' },
]}
extra="用户支付金额中，该比例将作为软件服务费归平台所有，剩余部分为商家预计收入"
>
<InputNumber
min={0}
max={1}
step={0.01}
precision={4}
style={{ width: '100%' }}
formatter={(v) => `${(Number(v) * 100).toFixed(2)}%`}
parser={(v) => Number(v?.replace('%', '')) / 100}
/>
</Form.Item>
<Form.Item>
<Button type="primary" loading={saving} onClick={handleSave}>
保存配置
</Button>
</Form.Item>
</Form>
<Divider />
<div style={{ color: '#666', fontSize: 14 }}>
<p><strong>计算公式：</strong></p>
<p>软件服务费 = 实付金额 × 服务费比例</p>
<p>商家预计收入 = 实付金额 - 软件服务费</p>
<p style={{ marginTop: 12 }}>
<strong>示例：</strong>实付金额 ¥100.00，服务费比例 5%
</p>
<p>软件服务费 = ¥5.00，商家预计收入 = ¥95.00</p>
</div>
</Card>
</div>
);
};
export default SystemSettings;
apps/platform-admin/src/pages/activity/ActivityList.tsx
-78
View File
@@ -1,78 +0,0 @@
import React, { useEffect, useState } from 'react';
import { Card, Table, Button, Tag, Space, message } from 'antd';
import { useNavigate } from 'react-router-dom';
import { getActivities, toggleActivity } from '@/api/activity';
import dayjs from 'dayjs';
const ACTIVITY_TYPES: Record<string, string> = {
invite_cashback: '邀请返现',
};
const ActivityList: React.FC = () => {
const navigate = useNavigate();
const [list, setList] = useState<any[]>([]);
const [total, setTotal] = useState(0);
const [page, setPage] = useState(1);
const [loading, setLoading] = useState(false);
const fetchList = async () => {
setLoading(true);
try {
const res = await getActivities({ page, pageSize: 10 });
setList(res.data?.list || []);
setTotal(res.data?.total || 0);
} finally {
setLoading(false);
}
};
useEffect(() => { fetchList(); }, [page]);
const handleToggle = async (record: any) => {
try {
await toggleActivity(record.id);
message.success(record.enabled ? '已停用' : '已启用');
fetchList();
} catch {}
};
const columns = [
{ title: 'ID', dataIndex: 'id', width: 60 },
{ title: '活动名称', dataIndex: 'name' },
{ title: '活动类型', dataIndex: 'type', render: (v: string) => ACTIVITY_TYPES[v] || v },
{ title: '状态', dataIndex: 'enabled', render: (v: boolean) => <Tag color={v ? 'green' : 'default'}>{v ? '启用' : '停用'}</Tag> },
{
title: '活动时间',
render: (_: any, r: any) => {
if (!r.startTime) return '不限';
return `${dayjs(r.startTime).format('YYYY-MM-DD')} ~ ${dayjs(r.endTime).format('YYYY-MM-DD')}`;
},
},
{ title: '创建时间', dataIndex: 'createdAt', render: (v: string) => v ? dayjs(v).format('YYYY-MM-DD HH:mm') : '-' },
{
title: '操作',
render: (_: any, r: any) => (
<Space>
<Button type="primary" size="small" onClick={() => navigate(`/activity/detail/${r.id}`)}>查看详情</Button>
<Button size="small" danger={r.enabled} type={r.enabled ? 'primary' : 'default'} onClick={() => handleToggle(r)}>
{r.enabled ? '停用' : '启用'}
</Button>
</Space>
),
},
];
return (
<Card title="活动列表" extra={<Button type="primary" onClick={() => navigate('/activity/detail/create')}>创建活动</Button>}>
<Table
rowKey="id"
columns={columns}
dataSource={list}
loading={loading}
pagination={{ current: page, total, pageSize: 10, onChange: setPage }}
/>
</Card>
);
};
export default ActivityList;
apps/platform-admin/src/pages/finance/Earnings.tsx
+2 -13
View File
@@ -100,19 +100,8 @@ const Earnings: React.FC = () => {
<Col span={6}>
<Card>
<Statistic
title="提现手续费"
value={data?.totalFee || 0}
precision={2}
prefix="¥"
valueStyle={{ color: '#faad14' }}
/>
</Card>
</Col>
<Col span={6}>
<Card>
<Statistic
title="提现佣金"
value={data?.totalWithdrawCommission || 0}
title="服务费收入"
value={data?.totalServiceFee || 0}
precision={2}
prefix="¥"
valueStyle={{ color: '#722ed1' }}
apps/platform-admin/src/pages/finance/Withdrawals.tsx
-2
View File
@@ -71,8 +71,6 @@ const Withdrawals: React.FC = () => {
const columns: ColumnsType<any> = [
{ title: '商家', dataIndex: ['merchant', 'shopName'], width: 120, ellipsis: true },
{ title: '提现金额', dataIndex: 'amount', width: 120, render: (v) => `¥${Number(v).toFixed(2)}` },
{ title: '手续费', dataIndex: 'fee', width: 90, render: (v) => `¥${Number(v).toFixed(2)}` },
{ title: '佣金', dataIndex: 'commissionAmount', width: 90, render: (v) => `¥${Number(v).toFixed(2)}` },
{ title: '实际到账', dataIndex: 'actualAmount', width: 120, render: (v) => <span style={{ color: '#1890ff', fontWeight: 600 }}>¥{Number(v).toFixed(2)}</span> },
{ title: '开户银行', dataIndex: 'bankName', width: 120 },
{ title: '银行账号', dataIndex: 'bankAccount', width: 150 },
apps/server/src/app.module.ts
+2
View File
@@ -16,6 +16,7 @@ import { AdminAuthModule } from './modules/admin-auth/admin-auth.module';
import { ReviewModule } from './modules/review/review.module';
import { FinanceModule } from './modules/finance/finance.module';
import { ActivityModule } from './modules/activity/activity.module';
import { PlatformConfigModule } from './modules/config/config.module';
import { ScheduleModule as TaskScheduleModule } from './schedule/schedule.module';
@Module({
@@ -53,6 +54,7 @@ import { ScheduleModule as TaskScheduleModule } from './schedule/schedule.module
RoomCalendarModule,
OrderModule,
AdminAuthModule,
PlatformConfigModule,
],
})
export class AppModule {}
apps/server/src/entities/order.entity.ts
+6
View File
@@ -44,6 +44,12 @@ export class Order {
@Column({ name: 'room_amount', type: 'decimal', precision: 10, scale: 2, unsigned: true, comment: '房费总额' })
roomAmount: number;
@Column({ name: 'service_fee', type: 'decimal', precision: 10, scale: 2, unsigned: true, default: 0, comment: '软件服务费' })
serviceFee: number;
@Column({ name: 'merchant_income', type: 'decimal', precision: 10, scale: 2, unsigned: true, default: 0, comment: '商家预计收入' })
merchantIncome: number;
@Column({ name: 'coupon_discount', type: 'decimal', precision: 10, scale: 2, unsigned: true, default: 0, comment: '优惠券抵扣' })
couponDiscount: number;
apps/server/src/entities/platform-config.entity.ts
+22
View File
@@ -0,0 +1,22 @@
import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
@Entity('platform_configs')
export class PlatformConfig {
@PrimaryGeneratedColumn({ type: 'bigint', unsigned: true })
id: number;
@Column({ name: 'config_key', length: 50, unique: true, comment: '配置键' })
configKey: string;
@Column({ name: 'config_value', length: 500, comment: '配置值' })
configValue: string;
@Column({ length: 200, nullable: true, comment: '配置说明' })
description: string;
@CreateDateColumn({ comment: '创建时间' })
createdAt: Date;
@UpdateDateColumn({ comment: '更新时间' })
updatedAt: Date;
}
apps/server/src/modules/activity/activity.controller.ts
+12
View File
@@ -124,6 +124,18 @@ export class AdminActivityController {
return this.activityService.getAdminStats();
}
@Get('invite/config')
@ApiOperation({ summary: '获取邀请活动配置' })
async getInviteConfig() {
return this.activityService.getInviteCashbackConfig();
}
@Put('invite/config')
@ApiOperation({ summary: '更新邀请活动配置' })
async updateInviteConfig(@Body() dto: UpdateActivityDto) {
return this.activityService.updateInviteCashbackConfig(dto);
}
@Get('invite/records')
@ApiOperation({ summary: '邀请记录列表' })
async getRecords(@Query() dto: QueryInviteRecordsDto) {
apps/server/src/modules/activity/activity.service.ts
+30
View File
@@ -435,6 +435,36 @@ export class ActivityService {
// ===== 管理端功能 =====
async getInviteCashbackConfig() {
const activity = await this.activityRepo.findOne({
where: { type: 'invite_cashback' },
});
if (!activity) {
// 创建默认配置
activity = this.activityRepo.create({
name: '邀请返现',
type: 'invite_cashback',
enabled: true,
config: {
firstOrderRate: 0.05,
secondOrderRate: 0.005,
minCashback: 0.01,
maxCashback: 50,
withdrawThreshold: 10,
},
});
await this.activityRepo.save(activity);
}
return activity;
}
async updateInviteCashbackConfig(dto: UpdateActivityDto) {
const activity = await this.getInviteCashbackConfig();
if (dto.enabled !== undefined) activity.enabled = dto.enabled;
if (dto.config) activity.config = { ...activity.config, ...dto.config };
return this.activityRepo.save(activity);
}
async getAdminStats(activityId?: number) {
const where: any = {};
if (activityId) where.activityId = activityId;
apps/server/src/modules/config/config.controller.ts
+26
View File
@@ -0,0 +1,26 @@
import { Controller, Get, Put, Body, UseGuards } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
import { ConfigService } from './config.service';
import { JwtAuthGuard, RolesGuard, Roles } from '@/common';
@ApiTags('管理端-系统配置')
@ApiBearerAuth()
@UseGuards(JwtAuthGuard, RolesGuard)
@Roles('admin')
@Controller('admin/config')
export class ConfigController {
constructor(private readonly configService: ConfigService) {}
@Get('service-fee')
@ApiOperation({ summary: '获取服务费配置' })
async getServiceFeeConfig() {
return this.configService.getServiceFeeConfig();
}
@Put('service-fee')
@ApiOperation({ summary: '更新服务费配置' })
async updateServiceFeeConfig(@Body() body: { rate: number }) {
await this.configService.updateServiceFeeRate(body.rate);
return this.configService.getServiceFeeConfig();
}
}
apps/server/src/modules/config/config.module.ts
+13
View File
@@ -0,0 +1,13 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { PlatformConfig } from '@/entities/platform-config.entity';
import { ConfigService } from './config.service';
import { ConfigController } from './config.controller';
@Module({
imports: [TypeOrmModule.forFeature([PlatformConfig])],
controllers: [ConfigController],
providers: [ConfigService],
exports: [ConfigService],
})
export class ConfigModule {}
apps/server/src/modules/config/config.service.ts
+57
View File
@@ -0,0 +1,57 @@
import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { PlatformConfig } from '@/entities/platform-config.entity';
@Injectable()
export class ConfigService {
constructor(
@InjectRepository(PlatformConfig)
private configRepo: Repository<PlatformConfig>,
) {}
async getConfig(key: string): Promise<string | null> {
const config = await this.configRepo.findOne({ where: { configKey: key } });
return config?.configValue || null;
}
async setConfig(key: string, value: string, description?: string): Promise<void> {
let config = await this.configRepo.findOne({ where: { configKey: key } });
if (config) {
config.configValue = value;
if (description) config.description = description;
} else {
config = this.configRepo.create({ configKey: key, configValue: value, description });
}
await this.configRepo.save(config);
}
async getServiceFeeRate(): Promise<number> {
const value = await this.getConfig('service_fee_rate');
const rate = parseFloat(value || '0.05');
return isNaN(rate) ? 0.05 : rate;
}
async getCommissionRate(): Promise<number> {
const value = await this.getConfig('commission_rate');
const rate = parseFloat(value || '0.10');
return isNaN(rate) ? 0.10 : rate;
}
async getServiceFeeConfig(): Promise<{ rate: number; description: string }> {
const value = await this.getConfig('service_fee_rate');
const config = await this.configRepo.findOne({ where: { configKey: 'service_fee_rate' } });
const rate = parseFloat(value || '0.05');
return {
rate: isNaN(rate) ? 0.05 : rate,
description: config?.description || '软件服务费比例',
};
}
async updateServiceFeeRate(rate: number): Promise<void> {
if (rate < 0 || rate > 1) {
throw new Error('服务费比例必须在0-1之间');
}
await this.setConfig('service_fee_rate', rate.toString(), '软件服务费比例');
}
}
apps/server/src/modules/finance/finance.service.ts
+11 -14
View File
@@ -119,13 +119,6 @@ export class FinanceService {
order: { createdAt: 'ASC' },
});
// 计算手续费率
const feeRate = 0.006;
const fee = Math.round(dto.amount * feeRate * 100) / 100;
const commissionRate = Number(merchant.walletBalance) > 0 ? 0.10 : 0;
const commissionAmount = Math.round(dto.amount * commissionRate * 100) / 100;
const actualAmount = Math.round((dto.amount - fee - commissionAmount) * 100) / 100;
const queryRunner = this.dataSource.createQueryRunner();
await queryRunner.connect();
await queryRunner.startTransaction();
@@ -138,9 +131,9 @@ export class FinanceService {
merchantId,
settlementIds: approvedSettlements.map(s => s.id),
amount: dto.amount,
fee,
commissionAmount,
actualAmount,
fee: 0,
commissionAmount: 0,
actualAmount: dto.amount,
bankName: dto.bankName,
bankAccount: dto.bankAccount,
accountName: dto.accountName,
@@ -361,8 +354,13 @@ export class FinanceService {
const withdrawalStats = await wQb
.select('COUNT(*)', 'totalWithdrawals')
.addSelect('COALESCE(SUM(CASE WHEN w.status = \'paid\' THEN w.amount ELSE 0 END), 0)', 'paidAmount')
.addSelect('COALESCE(SUM(w.fee), 0)', 'totalFee')
.addSelect('COALESCE(SUM(w.commission_amount), 0)', 'totalWithdrawCommission')
.getRawOne();
// 服务费统计
const serviceFeeStats = await this.orderRepo
.createQueryBuilder('o')
.where('o.status IN (:...statuses)', { statuses: ['completed', 'checked_in'] })
.select('COALESCE(SUM(o.service_fee), 0)', 'totalServiceFee')
.getRawOne();
return {
@@ -371,9 +369,8 @@ export class FinanceService {
settlementAmount: Number(settlementStats?.totalSettlementAmount || 0),
totalSettlements: Number(settlementStats?.totalSettlements || 0),
paidAmount: Number(withdrawalStats?.paidAmount || 0),
totalFee: Number(withdrawalStats?.totalFee || 0),
totalWithdrawCommission: Number(withdrawalStats?.totalWithdrawCommission || 0),
totalWithdrawals: Number(withdrawalStats?.totalWithdrawals || 0),
totalServiceFee: Number(serviceFeeStats?.totalServiceFee || 0),
};
}
apps/server/src/modules/order/order.module.ts
+2
View File
@@ -7,12 +7,14 @@ import { OrderService } from './order.service';
import { UserOrderController, MerchantOrderController, AdminOrderController } from './order.controller';
import { MerchantModule } from '../merchant/merchant.module';
import { ActivityModule } from '../activity/activity.module';
import { PlatformConfigModule } from '../config/config.module';
@Module({
imports: [
TypeOrmModule.forFeature([Order, Room, RoomCalendar]),
MerchantModule,
forwardRef(() => ActivityModule),
PlatformConfigModule,
],
controllers: [UserOrderController, MerchantOrderController, AdminOrderController],
providers: [OrderService],
apps/server/src/modules/order/order.service.ts
+9
View File
@@ -6,6 +6,7 @@ import { Room } from '@/entities/room.entity';
import { RoomCalendar } from '@/entities/room-calendar.entity';
import { CreateOrderDto, QueryOrderDto, ConfirmOrderDto } from './dto/order.dto';
import { ActivityService } from '@/modules/activity/activity.service';
import { ConfigService } from '@/modules/config/config.service';
@Injectable()
export class OrderService {
@@ -17,6 +18,7 @@ export class OrderService {
@InjectRepository(RoomCalendar)
private calendarRepo: Repository<RoomCalendar>,
private readonly activityService: ActivityService,
private readonly configService: ConfigService,
) {}
async create(userId: number, dto: CreateOrderDto) {
@@ -36,6 +38,11 @@ export class OrderService {
const totalAmount = roomAmount;
const payAmount = totalAmount - couponDiscount;
// 计算软件服务费和商家收入
const serviceFeeRate = await this.configService.getServiceFeeRate();
const serviceFee = Math.round(payAmount * serviceFeeRate * 100) / 100;
const merchantIncome = Math.round((payAmount - serviceFee) * 100) / 100;
const now = new Date();
const orderNo = [
now.getFullYear(),
@@ -59,6 +66,8 @@ export class OrderService {
guestCount: dto.guestCount || 1,
roomPrice: room.price,
roomAmount,
serviceFee,
merchantIncome,
couponDiscount,
totalAmount,
payAmount,