diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx index da6ce5d..06c514f 100644 --- a/src/dealer/index.tsx +++ b/src/dealer/index.tsx @@ -131,28 +131,28 @@ const DealerIndex: React.FC = () => { 佣金统计 - + - - ¥{formatMoney(dealerUser.money)} + + {formatMoney(dealerUser.money)} 可提现 - - ¥{formatMoney(dealerUser.freezeMoney)} + + {formatMoney(dealerUser.freezeMoney)} 冻结中 - - ¥{formatMoney(dealerUser.totalMoney)} + + {formatMoney(dealerUser.totalMoney)} 累计收益 diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 1cc459b..b6d7a88 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -1,10 +1,10 @@ -import React, { useState, useEffect, useCallback } from 'react' -import { View, Text } from '@tarojs/components' -import { Empty, Tabs, Tag, PullToRefresh, Loading } from '@nutui/nutui-react-taro' +import React, {useState, useEffect, useCallback} from 'react' +import {View, Text} from '@tarojs/components' +import {Empty, Tag, Space, PullToRefresh, Loading} from '@nutui/nutui-react-taro' import Taro from '@tarojs/taro' -import { pageShopDealerOrder } from '@/api/shop/shopDealerOrder' -import { useDealerUser } from '@/hooks/useDealerUser' -import type { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model' +import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder' +import {useDealerUser} from '@/hooks/useDealerUser' +import type {ShopDealerOrder} from '@/api/shop/shopDealerOrder/model' interface OrderWithDetails extends ShopDealerOrder { orderNo?: string @@ -16,20 +16,10 @@ interface OrderWithDetails extends ShopDealerOrder { } const DealerOrders: React.FC = () => { - const [activeTab, setActiveTab] = useState('0') const [loading, setLoading] = useState(false) const [orders, setOrders] = useState([]) - const [statistics, setStatistics] = useState({ - totalOrders: 0, - totalCommission: '0.00', - pendingCommission: '0.00', - // 分层统计 - level1: { orders: 0, commission: '0.00' }, - level2: { orders: 0, commission: '0.00' }, - level3: { orders: 0, commission: '0.00' } - }) - const { dealerUser } = useDealerUser() + const {dealerUser} = useDealerUser() // 获取订单数据 - 查询当前用户作为各层级分销商的所有订单 const fetchOrders = useCallback(async () => { @@ -39,24 +29,11 @@ const DealerOrders: React.FC = () => { setLoading(true) // 并行查询三个层级的订单 - const [level1Result, level2Result, level3Result] = await Promise.all([ + const [level1Result] = await Promise.all([ // 一级分销商订单 pageShopDealerOrder({ page: 1, - limit: 100, - firstUserId: dealerUser.userId - }), - // 二级分销商订单 - pageShopDealerOrder({ - page: 1, - limit: 100, - secondUserId: dealerUser.userId - }), - // 三级分销商订单 - pageShopDealerOrder({ - page: 1, - limit: 100, - thirdUserId: dealerUser.userId + limit: 10 }) ]) @@ -65,16 +42,16 @@ const DealerOrders: React.FC = () => { totalOrders: 0, totalCommission: '0.00', pendingCommission: '0.00', - level1: { orders: 0, commission: '0.00' }, - level2: { orders: 0, commission: '0.00' }, - level3: { orders: 0, commission: '0.00' } + level1: {orders: 0, commission: '0.00'}, + level2: {orders: 0, commission: '0.00'}, + level3: {orders: 0, commission: '0.00'} } // 处理一级分销订单 if (level1Result?.list) { const level1Orders = level1Result.list.map(order => ({ ...order, - orderNo: `DD${order.orderId}`, + orderNo: `${order.orderId}`, customerName: `用户${order.userId}`, userLevel: 1 as const, userCommission: order.firstMoney || '0.00', @@ -92,50 +69,6 @@ const DealerOrders: React.FC = () => { ).toFixed(2) } - // 处理二级分销订单 - if (level2Result?.list) { - const level2Orders = level2Result.list.map(order => ({ - ...order, - orderNo: `DD${order.orderId}`, - customerName: `用户${order.userId}`, - userLevel: 2 as const, - userCommission: order.secondMoney || '0.00', - totalCommission: ( - parseFloat(order.firstMoney || '0') + - parseFloat(order.secondMoney || '0') + - parseFloat(order.thirdMoney || '0') - ).toFixed(2) - })) - - allOrders.push(...level2Orders) - stats.level2.orders = level2Orders.length - stats.level2.commission = level2Orders.reduce((sum, order) => - sum + parseFloat(order.userCommission || '0'), 0 - ).toFixed(2) - } - - // 处理三级分销订单 - if (level3Result?.list) { - const level3Orders = level3Result.list.map(order => ({ - ...order, - orderNo: `DD${order.orderId}`, - customerName: `用户${order.userId}`, - userLevel: 3 as const, - userCommission: order.thirdMoney || '0.00', - totalCommission: ( - parseFloat(order.firstMoney || '0') + - parseFloat(order.secondMoney || '0') + - parseFloat(order.thirdMoney || '0') - ).toFixed(2) - })) - - allOrders.push(...level3Orders) - stats.level3.orders = level3Orders.length - stats.level3.commission = level3Orders.reduce((sum, order) => - sum + parseFloat(order.userCommission || '0'), 0 - ).toFixed(2) - } - // 去重（同一个订单可能在多个层级中出现） const uniqueOrders = allOrders.filter((order, index, self) => index === self.findIndex(o => o.orderId === order.orderId) @@ -154,7 +87,6 @@ const DealerOrders: React.FC = () => { .toFixed(2) setOrders(uniqueOrders) - setStatistics(stats) } catch (error) { console.error('获取分销订单失败:', error) @@ -193,39 +125,42 @@ const DealerOrders: React.FC = () => { const renderOrderItem = (order: OrderWithDetails) => ( - - - + + + 订单号：{order.orderNo} - - 客户：{order.customerName} - {/* 显示用户在此订单中的层级 */} - - {order.userLevel === 1 && '一级分销'} - {order.userLevel === 2 && '二级分销'} - {order.userLevel === 3 && '三级分销'} - - + {/**/} + {/* {order.userLevel === 1 && '一级分销'}*/} + {/* {order.userLevel === 2 && '二级分销'}*/} + {/* {order.userLevel === 3 && '三级分销'}*/} + {/**/} + {getStatusText(order.isSettled, order.isInvalid)} - - - + + + 订单金额：¥{order.orderPrice || '0.00'} 我的佣金：¥{order.userCommission} - - 总佣金：¥{order.totalCommission} - - - + {/**/} + {/* 总佣金：¥{order.totalCommission}*/} + {/**/} + + + + + + 客户：{order.customerName} + + {order.createTime} @@ -255,136 +190,27 @@ const DealerOrders: React.FC = () => { if (!dealerUser) { return ( - + 加载中... ) } return ( - - {/* 统计卡片 */} - - {/* 总体统计 */} - - - {statistics.totalOrders} - 总订单 - - - ¥{statistics.totalCommission} - 总佣金 - - - ¥{statistics.pendingCommission} - 待结算 - - - - {/* 分层统计 */} - - 分层统计 - - - {statistics.level1.orders} - 一级订单 - ¥{statistics.level1.commission} - - - {statistics.level2.orders} - 二级订单 - ¥{statistics.level2.commission} - - - {statistics.level3.orders} - 三级订单 - ¥{statistics.level3.commission} - - - - - + {/* 订单列表 */} - setActiveTab}> - - - - {loading ? ( - - - 加载中... - - ) : getFilteredOrders('0').length > 0 ? ( - getFilteredOrders('0').map(renderOrderItem) - ) : ( - - )} - - - - - - - {getFilteredOrders('1').length > 0 ? ( - getFilteredOrders('1').map(renderOrderItem) - ) : ( - - )} - - - - - - {getFilteredOrders('2').length > 0 ? ( - getFilteredOrders('2').map(renderOrderItem) - ) : ( - - )} - - - - - - {getFilteredOrders('3').length > 0 ? ( - getFilteredOrders('3').map(renderOrderItem) - ) : ( - - )} + + {loading ? ( + + + 加载中... - - - - - {getFilteredOrders('4').length > 0 ? ( - getFilteredOrders('4').map(renderOrderItem) - ) : ( - - )} - - - - - - {getFilteredOrders('5').length > 0 ? ( - getFilteredOrders('5').map(renderOrderItem) - ) : ( - - )} - - - - - - {getFilteredOrders('6').length > 0 ? ( - getFilteredOrders('6').map(renderOrderItem) - ) : ( - - )} - - - + ) : getFilteredOrders('0').length > 0 ? ( + getFilteredOrders('0').map(renderOrderItem) + ) : ( + + )} + ) }