fix

src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -107,46 +107,49 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '游戏区服', dataIndex: 'serverName', label: '订单明细', align: 'center', width: 85, default: 22,
+                    title: '原始服务器名', dataIndex: 'sourceServerName', label: '订单明细', align: 'center', width: 85, default: 22,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '游戏角色', dataIndex: 'roleName', label: '订单明细', align: 'center', width: 85, default: 23,
+                    title: '游戏区服', dataIndex: 'serverName', label: '订单明细', align: 'center', width: 85, default: 23,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色等级', dataIndex: 'roleLevel', label: '订单明细', align: 'center', width: 50, default: 24,
+                    title: '游戏角色', dataIndex: 'roleName', label: '订单明细', align: 'center', width: 85, default: 24,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色VIP', dataIndex: 'roleVip', label: '订单明细', align: 'center', width: 45, default: 25,
+                    title: '角色等级', dataIndex: 'roleLevel', label: '订单明细', align: 'center', width: 50, default: 25,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '操作系统', dataIndex: 'os', label: '订单明细', align: 'center', width: 65, default: 26,
+                    title: '角色VIP', dataIndex: 'roleVip', label: '订单明细', align: 'center', width: 45, default: 26,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '是否切量', dataIndex: 'orderIsSwitch', label: '订单明细', align: 'center', width: 45, default: 27,
+                    title: '操作系统', dataIndex: 'os', label: '订单明细', align: 'center', width: 65, default: 27,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '下单时间', dataIndex: 'orderCreateTime', label: '订单明细', align: 'center', width: 135, default: 28, sorter: true,
+                    title: '是否切量', dataIndex: 'orderIsSwitch', label: '订单明细', align: 'center', width: 45, default: 28,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '支付时间', dataIndex: 'payTime', label: '订单明细', align: 'center', width: 135, default: 29, sorter: true,
+                    title: '下单时间', dataIndex: 'orderCreateTime', label: '订单明细', align: 'center', width: 135, default: 29, sorter: true,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '支付时间', dataIndex: 'payTime', label: '订单明细', align: 'center', width: 135, default: 30, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
                     title: '注册充值时间差',
-                    dataIndex: 'regPayTimeDiff',
+                    dataIndex: 'regUntilPay',
                     align: 'center',
                     width: 140,
-                    default: 30,
-                    render: (a: string, b: any) => {
-                        if (b?.payTime) {
-                            let diff = new Date(b.payTime).getTime() - new Date(b.regTime).getTime()
+                    default: 31,
+                    render: (a: number) => {
+                        if (a) {
                             function secondsToDhms(seconds: any) {
                                 const days = Math.floor(seconds / (3600 * 24));
                                 const hours = Math.floor((seconds % (3600 * 24)) / 3600);
@@ -154,7 +157,7 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                                 const remainingSeconds = seconds % 60;
                                 return `${days ? days + "天" : ''}${hours ? hours + "小时" : ''}${minutes ? minutes + "分" : ''}${remainingSeconds ? remainingSeconds + "秒" : ''}`
                             }
-                            return diff ? secondsToDhms(diff / 1000) : '--'
+                            return a ? secondsToDhms(a) : '--'
                         } else {
                             return '--'
                         }
@@ -162,13 +165,12 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                 },
                 {
                     title: '最近充值时间距今',
-                    dataIndex: 'nowPayTimeDiff',
+                    dataIndex: 'payUntilNow',
                     align: 'center',
                     width: 135,
-                    default: 31,
-                    render: (a: string, b: any) => {
-                        if (b?.payTime) {
-                            let diff = new Date().getTime() - new Date(b.payTime).getTime()
+                    default: 32,
+                    render: (a: number) => {
+                        if (a) {
                             function secondsToDhms(seconds: any) {
                                 const days = Math.floor(seconds / (3600 * 24));
                                 const hours = Math.floor((seconds % (3600 * 24)) / 3600);
@@ -176,18 +178,18 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                                 const remainingSeconds = seconds % 60;
                                 return `${days ? days + "天" : ''}${hours ? hours + "小时" : ''}${minutes ? minutes + "分" : ''}${remainingSeconds ? remainingSeconds.toFixed(0) + "秒" : ''}`
                             }
-                            return diff ? secondsToDhms(diff / 1000) : '--'
+                            return a ? secondsToDhms(a) : '--'
                         } else {
                             return '--'
                         }
                     }
                 },
                 {
-                    title: '支付状态', dataIndex: 'orderStatus', label: '订单明细', align: 'center', width: 85, default: 32,
+                    title: '支付状态', dataIndex: 'orderStatus', label: '订单明细', align: 'center', width: 85, default: 33,
                     render: (a: string, b: any) => (<WidthEllipsis value={PayStatus[a]} />)
                 },
                 {
-                    title: '是否首充', dataIndex: 'isFirstRecharge', label: '订单明细', align: 'center', width: 45, default: 33,
+                    title: '是否首充', dataIndex: 'isFirstRecharge', label: '订单明细', align: 'center', width: 45, default: 34,
                     render: (a: any, b: any) => {
                         if (b?.day !== '总计') {
                             return a == 1 ? '是' : '否'

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/tableConfig.tsx

@@ -84,25 +84,12 @@ function columns12() {
                 },
                 {
                     title: '最小原始子服开服距今天数',
-                    dataIndex: 'minServerStarttimeDiff',
+                    dataIndex: 'min_server_start_days',
                     align: 'center',
                     label: '区服信息',
                     width: 130,
                     sorter: true,
-                    render: (a: string, b: any) => {
-                        let diff = 0
-                        if (b.min_server_start_time) {
-                            diff = new Date().getTime() - new Date(b.min_server_start_time).getTime()
-                        }
-                        function secondsToDhms(seconds: any) {
-                            const days = Math.floor(seconds / (3600 * 24));
-                            const hours = Math.floor((seconds % (3600 * 24)) / 3600);
-                            const minutes = Math.floor((seconds % 3600) / 60);
-                            const remainingSeconds = seconds % 60;
-                            return `${days ? days + "天" : ''}${hours ? hours + "小时" : ''}${minutes ? minutes + "分" : ''}${remainingSeconds ? remainingSeconds.toFixed(0) + "秒" : ''}`
-                        }
-                        return diff ? <span><WidthEllipsis value={secondsToDhms(diff / 1000)} /></span> : '--'
-                    }
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
             ]
         },