src/api/shop/shopDealerOrder/model/index.ts

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

src/dealer/orders/index.tsx

@@ -94,15 +94,19 @@ const DealerOrders: React.FC = () => {
     }
   }, [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 (isUnfreeze === 1) return '已解冻'
     if (isSettled === 1) 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 (isSettled === 1) return 'success'
+    if (isUnfreeze === 1) return 'success'
+    if (isSettled === 1) return 'info'
     return 'warning'
   }
 
@@ -120,8 +124,8 @@ const DealerOrders: React.FC = () => {
         <Text className="font-semibold text-gray-800">
           订单号：{order.orderNo || '-'}
         </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>
       </View>