diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts index 0be25d5..03916cd 100644 --- a/src/api/shop/shopDealerOrder/model/index.ts +++ b/src/api/shop/shopDealerOrder/model/index.ts @@ -1,4 +1,4 @@ -import type { PageParam } from '@/api/index'; +import type { PageParam } from '@/api'; /** * 分销商订单记录表 @@ -8,6 +8,8 @@ export interface ShopDealerOrder { id?: number; // 买家用户ID userId?: number; + // 昵称 + nickname?: string; // 订单编号 orderNo?: string; // 订单总金额(不含运费) @@ -24,6 +26,12 @@ export interface ShopDealerOrder { secondMoney?: string; // 分销佣金(三级) thirdMoney?: string; + // 分销商昵称(一级) + firstNickname: undefined, + // 分销商昵称(二级) + secondNickname: undefined, + // 分销商昵称(三级) + thirdNickname: undefined, // 订单结算金额 settledPrice?: string; // 订单支付金额 diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 2d6557e..56c2305 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -43,6 +43,7 @@ const DealerOrder: React.FC = () => { const result = await pageShopDealerOrder({ isInvalid: 0, + isSettled: 1, resourceId: Taro.getStorageSync('UserId'), month: date, page, @@ -125,6 +126,42 @@ const DealerOrder: React.FC = () => { + {/* 添加收益用户信息显示 */} + + + 收益计算 + + + + {/* 间推收益用户 */} + {(order.firstNickname || order.firstUserId) && ( + + 自有收益:{order.firstNickname || `用户${order.firstUserId}`} (¥{order.firstMoney || '0.00'}) + + )} + + {/* 一级分销商 */} + {(order.nickname || order.userId) && ( + + 合作方收益:{order.nickname || `用户${order.userId}`} (¥{order.secondMoney || '0.00'}) + + )} + + {/* 三级分销商 */} + {(order.thirdUserId && order.thirdUserId == 0) && ( + + 联盟收益补贴:{order.thirdNickname || `用户${order.thirdUserId}`} (¥{order.thirdMoney || '0.00'}) + + )} + + {/* 如果都没有信息 */} + {!(order.firstNickname || order.firstUserId || order.nickname || order.userId || order.thirdNickname || order.thirdUserId) && ( + + 暂无收益用户 + + )} + + 结算月份:{order.month}