feat(dealer): 添加订单解冻状态和订单状态显示功能

- 在订单模型中新增佣金解冻字段和订单状态字段
- 扩展订单状态判断逻辑支持解冻状态和订单取消状态
- 更新订单状态颜色映射适配新的状态类型
- 修改订单组件中的状态显示以支持新字段
- 优化订单状态文本和颜色渲染逻辑
This commit is contained in:
2026-02-28 19:42:56 +08:00
parent 338dc421db
commit a8eb9e11be
3 changed files with 13 additions and 5 deletions

BIN
dist.zip

Binary file not shown.

View File

@@ -31,6 +31,10 @@ export interface ShopDealerOrder {
isInvalid?: number; isInvalid?: number;
// 佣金结算(0未结算 1已结算) // 佣金结算(0未结算 1已结算)
isSettled?: number; isSettled?: number;
// 佣金解冻(0未解冻 1已解冻)
isUnfreeze?: number;
// 订单状态
orderStatus?: number;
// 结算时间 // 结算时间
settleTime?: number; settleTime?: number;
// 商城ID // 商城ID

View File

@@ -94,15 +94,19 @@ const DealerOrders: React.FC = () => {
} }
}, [fetchOrders]) }, [fetchOrders])
const getStatusText = (isSettled?: number, isInvalid?: number) => { const getStatusText = (isSettled?: number, isInvalid?: number, isUnfreeze?: number, orderStatus?: number) => {
if (orderStatus === 2 || orderStatus === 5 || orderStatus === 6) return '已取消'
if (isInvalid === 1) return '已失效' if (isInvalid === 1) return '已失效'
if (isUnfreeze === 1) return '已解冻'
if (isSettled === 1) return '已结算' if (isSettled === 1) return '已结算'
return '待结算' return '待结算'
} }
const getStatusColor = (isSettled?: number, isInvalid?: number) => { const getStatusColor = (isSettled?: number, isInvalid?: number, isUnfreeze?: number, orderStatus?: number) => {
if (orderStatus === 2 || orderStatus === 5 || orderStatus === 6) return 'default'
if (isInvalid === 1) return 'danger' if (isInvalid === 1) return 'danger'
if (isSettled === 1) return 'success' if (isUnfreeze === 1) return 'success'
if (isSettled === 1) return 'info'
return 'warning' return 'warning'
} }
@@ -120,8 +124,8 @@ const DealerOrders: React.FC = () => {
<Text className="font-semibold text-gray-800"> <Text className="font-semibold text-gray-800">
{order.orderNo || '-'} {order.orderNo || '-'}
</Text> </Text>
<Tag type={getStatusColor(order.isSettled, order.isInvalid)}> <Tag type={getStatusColor(order.isSettled, order.isInvalid, order.isUnfreeze,order.orderStatus)}>
{getStatusText(order.isSettled, order.isInvalid)} {getStatusText(order.isSettled, order.isInvalid, order.isUnfreeze,order.orderStatus)}
</Tag> </Tag>
</View> </View>