diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 93e2759..dc02cae 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -6,6 +6,7 @@ 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 {useUser} from "@/hooks/useUser"; interface OrderWithDetails extends ShopDealerOrder { orderNo?: string @@ -27,6 +28,7 @@ const DealerOrder: React.FC = () => { const [hasMore, setHasMore] = useState(true) const {dealerUser} = useDealerUser() + const {user} = useUser() // 获取订单数据 const fetchOrders = useCallback(async (page: number = 1, isRefresh: boolean = false) => { @@ -44,7 +46,7 @@ const DealerOrder: React.FC = () => { const result = await pageShopDealerOrder({ isInvalid: 0, isSettled: 1, - resourceId: Taro.getStorageSync('UserId') == 33658 ? undefined : Taro.getStorageSync('UserId'), + resourceId: getResourceId(), month: date, page, limit: 10 @@ -93,6 +95,24 @@ const DealerOrder: React.FC = () => { } } + const getResourceId = () => { + if (hasRole('superAdmin')) { + return undefined + } + if (hasRole('admin')) { + return user?.userId + } + } + + // 检查是否有特定角色 + const hasRole = (roleCode: string) => { + if (!user || !user.roles) { + return false; + } + return user.roles.some(role => role.roleCode === roleCode); + } + + // 初始化加载数据 useEffect(() => { if (dealerUser?.userId) { @@ -135,17 +155,23 @@ const DealerOrder: React.FC = () => { {/*DealerId:{Taro.getStorageSync('DealerId')}*/} {/* 一级佣金30 */} - {(order.firstNickname || order.firstUserId) && ( - - 一级佣金:{order.firstNickname || `用户${order.firstUserId}`} (¥{order.firstMoney || '0.00'}) - - )} - - {/* 一级分销商 */} - {(order.secondUserId || order.secondUserId) && ( - - 二级佣金:{order.secondNickname || `用户${order.secondUserId}`} (¥{order.secondMoney || '0.00'}) - + {(hasRole('superAdmin') || hasRole('admin') || Taro.getStorageSync('UserId') != order.thirdUserId) && ( + <> + {Taro.getStorageSync('UserId') != order.secondUserId && ( + <> + {(order.firstNickname || order.firstUserId) && ( + + 一级佣金:{order.firstNickname || `用户${order.firstUserId}`} (¥{order.firstMoney || '0.00'}) + + )} + + )} + {(order.secondUserId || order.secondUserId) && ( + + 二级佣金:{order.secondNickname || `用户${order.secondUserId}`} (¥{order.secondMoney || '0.00'}) + + )} + )} {/* 三级分销商 */}