Improvement: add status enum in order

src/constants/index.ts

@@ -105,4 +105,16 @@ export const ORDER_STATUS_ENUM: ProSchemaValueEnumObj = {
     text: '待退款',
     status: 'warning',
   },
+  refund_requested: {
+    text: '已申请退款',
+    status: 'refund_approved',
+  },
+  refund_approved: {
+    text: '退款申请已通过',
+    status: 'refund_approved',
+  },
+  refund_cancelled: {
+    text: '已取消退款',
+    status: 'refund_cancelled',
+  }
 };

src/pages/Order/List/index.tsx

@@ -122,6 +122,18 @@ const ListPage: React.FC = () => {
         key: 'pending_reshipment',
         label: '待补发',
       },
+      {
+        key: 'refund_requested',
+        label: '已申请退款',
+      },
+      {
+        key: 'refund_approved',
+        label: '退款申请已通过',
+      },
+      {
+        key: 'refund_cancelled',
+        label: '已取消退款',
+      },
       // {
       //   key: 'pending_refund',
       //   label: '待退款',
@@ -188,6 +200,10 @@ const ListPage: React.FC = () => {
       dataIndex: 'total',
       hideInSearch: true,
     },
+    {
+      title: '支付方式',
+      dataIndex: 'payment_method',
+    },
     {
       title: '总订单数',
       dataIndex: 'order_count',
@@ -202,6 +218,12 @@ const ListPage: React.FC = () => {
       title: '客户邮箱',
       dataIndex: 'customer_email',
     },
+    {
+      title: '联系电话',
+      dataIndex: 'billing_phone',
+       render: (_, record) => record.shipping?.phone || record.billing?.phone,
+   
+    },
     {
       title: '州',
       hideInSearch: true,
@@ -743,6 +765,7 @@ const Detail: React.FC<{
           />
           <ProDescriptions.Item label="金额" dataIndex="total" />
           <ProDescriptions.Item label="客户邮箱" dataIndex="customer_email" />
+          <ProDescriptions.Item label="联系电话" dataIndex="billing_phone" />
           <ProDescriptions.Item label="交易Id" dataIndex="transaction_id" />
           <ProDescriptions.Item label="IP" dataIndex="customer_id_address" />
           <ProDescriptions.Item label="设备" dataIndex="device_type" />
@@ -2054,6 +2077,7 @@ const CreateOrder: React.FC<{
             {
               ...data,
               customer_email: data?.billing?.email,
+              billing_phone: data?.billing?.phone,
             },
           );
           if (!success) throw new Error(errMsg);

src/pages/Stock/Record/index.tsx

@@ -26,6 +26,19 @@ const ListPage: React.FC = () => {
       dataIndex: 'productSku',
       hideInSearch: true,
     },
+    {
+      title: '出入库',
+      dataIndex: 'operationType',
+      valueType: 'select',
+      valueEnum: {
+        'in': {
+          text: '入库'
+        },
+        "out": {
+          text: '出库'
+        }
+      },
+    },
     {
       title: '库存',
       hideInSearch: true,
@@ -52,6 +65,18 @@ const ListPage: React.FC = () => {
       valueType: 'dateTime',
       hideInSearch: true,
     },
+    {
+      title: '起始日期',
+      dataIndex: 'startDate',
+      valueType: 'date',
+      hideInTable: true,
+    },
+    {
+      title: '结束日期',
+      dataIndex: 'endDate',
+      valueType: 'date',
+      hideInTable: true,
+    },
   ];
 
   return (

src/servers/api/typings.d.ts

@@ -235,6 +235,7 @@ declare namespace API {
     total_tax?: number;
     customer_id?: number;
     customer_email?: string;
+    billing_phone?: string;
     order_key?: string;
     billing?: OrderAddress;
     shipping?: OrderAddress;
@@ -318,6 +319,7 @@ declare namespace API {
     externalOrderId?: string;
     siteId?: string;
     customer_email?: string;
+    billing_phone?: string;
     keyword?: string;
     startDate?: string;
     endDate?: string;
@@ -330,7 +332,11 @@ declare namespace API {
       | 'failed'
       | 'after_sale_pending'
       | 'pending_reshipment'
-      | 'pending_refund';
+      | 'pending_refund'
+      | 'refund_requested'
+      | 'refund_approved'
+      | 'refund_cancelled';
+    payment_method?: string;
   };
 
   type ordercontrollerRefundorderParams = {
@@ -371,6 +377,7 @@ declare namespace API {
     total_tax?: number;
     customer_id?: number;
     customer_email?: string;
+    billing_phone?: string;
     order_key?: string;
     billing?: OrderAddress;
     shipping?: OrderAddress;
@@ -840,6 +847,7 @@ declare namespace API {
     externalOrderId?: string;
     siteId?: string;
     customer_email?: string;
+    billing_phone?: string;
     keyword?: string;
     startDate?: string;
     endDate?: string;
@@ -852,7 +860,11 @@ declare namespace API {
       | 'failed'
       | 'after_sale_pending'
       | 'pending_reshipment'
-      | 'pending_refund';
+      | 'pending_refund'
+      | 'refund_requested'
+      | 'refund_approved'
+      | 'refund_cancelled';
+    payment_method?: string;
   };
 
   type QueryOrderSalesDTO = {
@@ -920,6 +932,9 @@ declare namespace API {
     stockPointId?: number;
     productSku?: string;
     productName?: string;
+    operationType?: string;
+    startDate?: string;
+    endDate?: string;
   };
 
   type QueryStrengthDTO = {
@@ -1137,6 +1152,9 @@ declare namespace API {
     stockPointId?: number;
     productSku?: string;
     productName?: string;
+    operationType?: string;
+    startDate?: string;
+    endDate?: string;
   };
 
   type stockcontrollerGetstocksParams = {