fix

src/pages/gameDataStatistics/adlist/monitor/const.tsx

@@ -3,29 +3,32 @@ import React from "react";
 
 /** 广告状态 */
 export const ADSTATUSEnum = {
-    'NOT_DELETED': '不限',
-    'ALL': '不限（包含已删除）',
+    'NOT_DELETED': <Badge color={'cyan'} text='不限' />,
+    'ALL': <Badge color={'cyan'} text='不限（包含已删除）' />,
     'OK': <Badge status="processing" text='投放中' />,
     'DELETED': <Badge status="error" text='已删除' />,
     'PROJECT_OFFLINE_BUDGET': <Badge status="error" text='项目超出预算' />,
     'PROJECT_PREOFFLINE_BUDGET': <Badge status="warning" text='项目接近预算' />,
-    'TIME_NO_REACH': '未到达投放时间',
+    'TIME_NO_REACH': <Badge color={'purple'} text='未到达投放时间' />,
     'TIME_DONE': <Badge status="success" text='已完成' />,
-    'NO_SCHEDULE': '不在投放时段',
-    'AUDIT': '新建审核中',
-    'REAUDIT': '修改审核中',
-    'FROZEN': '已终止',
-    'AUDIT_DENY': '审核不通过',
-    'OFFLINE_BUDGET': '广告超出预算',
-    'OFFLINE_BALANCE': '账户余额不足',
-    'PREOFFLINE_BUDGET': '广告接近预算',
+    'NO_SCHEDULE': <Badge color={'volcano'} text='不在投放时段' />,
+    'AUDIT': <Badge status="success" text='新建审核中' />,
+    'REAUDIT': <Badge status="success" text='修改审核中' />,
+    'FROZEN': <Badge status="error" text='已终止' />,
+    'AUDIT_DENY': <Badge status="error" text='审核不通过' />,
+    'OFFLINE_BUDGET': <Badge status="error" text='广告超出预算' />,
+    'OFFLINE_BALANCE': <Badge status="error" text='账户余额不足' />,
+    'PREOFFLINE_BUDGET': <Badge status="warning" text='广告接近预算' />,
     'DISABLED': <Badge status="default" text='已暂停' />,
     'PROJECT_DISABLED': <Badge status="default" text='已被项目暂停' />,
     'LIVE_ROOM_OFF': '关联直播间不可投',
     'PRODUCT_OFFLINE': '关联商品不可投',
     'AWEME_ACCOUNT_DISABLED': '关联抖音账号不可投',
     'AWEME_ANCHOR_DISABLED': '锚点不可投',
-    'DISABLE_BY_QUOTA': '已暂停（配额达限）'
+    'DISABLE_BY_QUOTA': <Badge status="default" text='已暂停（配额达限）' />,
+    'CREATE': <Badge status="default" text='新建' />,
+    'ADVERTISER_OFFLINE_BUDGET': <Badge status="error" text='账号超出预算' />,
+    'ADVERTISER_PREOFFLINE_BUDGET': <Badge status="warning" text='账号接近预算' />
 }
 
 /** 出价方式 */

src/pages/gameDataStatistics/adlist/monitor/index.tsx

@@ -32,10 +32,9 @@ const Monitor = () => {
             leftChild={<QueryForm
                 initialValues={{ sourceSystem: 'ZX_ONE', consumeDay: [moment(), moment()] }}
                 onChange={(data: any) => {
-                    const { type, gameClassify, costBeginDay, costEndDay, pitcherId, sysUserName, ...params } = data
+                    const { type, gameClassify, costBeginDay, costEndDay, sysUserName, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
-                    newQueryForm.zxPitcherId = pitcherId
                     newQueryForm.pitcherName = sysUserName
                     newQueryForm.accountType = type
                     newQueryForm.classify = gameClassify

src/pages/gameDataStatistics/extensionData/everyday/tableConfig.tsx

@@ -76,7 +76,8 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
         return data
     })
 
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    let index = 1;
+    const roiC = Array(29).fill('').map((_item: string) => {
         let data = {
             title: `${index + 1}日ROI`,
             dataIndex: `roiDay${index + 1}`,
@@ -86,6 +87,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
             sorter: true,
             render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
         }
+        index++;
         return data
     })
 
@@ -206,7 +208,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '买量回收率', dataIndex: 'buyRecoveryRate', label: '付费数据', align: 'center', width: 70, sorter: true,
+                    title: '至今回收率', tips: '至今回收率=新用户累计充值金额/实际消耗', dataIndex: 'buyRecoveryRate', label: '付费数据', align: 'center', width: 80, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 { title: '毛利额', dataIndex: 'grossMargin', label: '付费数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
@@ -255,7 +257,7 @@ function columns12(rechargeTrendHandle: (data: any) => void): { label: string, f
                 // },
                 { title: '新增注册ARPPU', dataIndex: 'newRegArpu', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日付费ARPPU', dataIndex: 'firstRechargeArpu', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '当天付费ARPPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '至今付费ARPPU', tips: '至今付费ARPPU=新用户累计充值金额/新用户累计充值人数', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '账面ARPPU', dataIndex: 'showRechargeArpu', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> }
             ]
         },

src/pages/gameDataStatistics/extensionData/total/tableConfig.tsx

@@ -6,7 +6,8 @@ import React from "react"
 function columns12(gameType: any) {
 
     let defaultStart = 19
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    let index = 1
+    const roiC = Array(29).fill('').map((_item: string) => {
         let data = {
             title: `${index + 1}日ROI`,
             dataIndex: `roiDay${index + 1}`,
@@ -19,6 +20,7 @@ function columns12(gameType: any) {
         if (index < 7) {
             data['default'] = defaultStart + index
         }
+        index++;
         return data
     })
 
@@ -125,9 +127,9 @@ function columns12(gameType: any) {
         {
             label: '付费数据',
             data: [
-                { title: '新用户充值次数', dataIndex: 'userRechargeCount', label: '付费数据', align: 'center', width: 70, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '新用户充值人数', dataIndex: 'userRechargeUser', label: '付费数据', align: 'center', width: 70, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '新用户充值金额', dataIndex: 'userRechargeMoney', label: '付费数据', align: 'center', width: 70, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '新用户充值次数', tips: '消耗时间范围内用户，在充值时间内充值次数统计', dataIndex: 'userRechargeCount', label: '付费数据', align: 'center', width: 80, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '新用户充值人数', tips: '消耗时间范围内用户，在充值时间内充值人数统计', dataIndex: 'userRechargeUser', label: '付费数据', align: 'center', width: 80, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '新用户充值金额', tips: '消耗时间范围内用户，在充值时间内充值金额统计', dataIndex: 'userRechargeMoney', label: '付费数据', align: 'center', width: 80, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日新用户充值次数', dataIndex: 'firstUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日新用户充值人数', dataIndex: 'firstUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日新用户充值金额', dataIndex: 'firstUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
@@ -145,11 +147,11 @@ function columns12(gameType: any) {
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '回收率', dataIndex: 'recoveryRate', label: '付费数据', align: 'center', width: 90, default: 16,
+                    title: '回收率', tips: '回收率=新用户充值金额/实际消耗', dataIndex: 'recoveryRate', label: '付费数据', align: 'center', width: 90, default: 16,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '当日回收率', dataIndex: 'todayRecoveryRate', label: '付费数据', align: 'center', width: 90, default: 17, sorter: true,
+                    title: '至今回收率', tips: '至今回收率=新用户累计充值金额/实际消耗', dataIndex: 'todayRecoveryRate', label: '付费数据', align: 'center', width: 95, default: 17, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
@@ -207,7 +209,7 @@ function columns12(gameType: any) {
                 //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 // },
                 {
-                    title: '新用户复充率', dataIndex: 'userRepeatRechargeRate', label: '付费数据', align: 'center', width: 70,
+                    title: '新用户复充率', tips: '消耗时间范围内注册用户，在充值时间内重复充值（即用户累计充值次数n≥2)。计算公式：新用户复冲率=新用户复充人数/新用户累计充值人数', dataIndex: 'userRepeatRechargeRate', label: '付费数据', align: 'center', width: 80,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 // {
@@ -217,7 +219,7 @@ function columns12(gameType: any) {
                 { title: '新增注册ARPPU', dataIndex: 'newRegArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} precision={2}/> },
                 { title: '首日付费ARPPU', dataIndex: 'firstRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} precision={2}/> },
                 { title: '新用户付费ARPPU', dataIndex: 'userRechargeArpu', label: '付费数据', align: 'center', width: 80, render: (a: string) => <Statistic value={a || 0} precision={2}/> },
-                { title: '当天付费ARPPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} precision={2}/> },
+                { title: '至今付费ARPPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} precision={2}/> },
                 { title: '账面ARPPU', dataIndex: 'showRechargeArpu', label: '付费数据', align: 'center', width: 80, render: (a: string) => <Statistic value={a || 0} precision={2}/> }
             ]
         },

src/pages/gameDataStatistics/gameData/total/tableConfig.tsx

@@ -188,10 +188,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '买量账面客单价', dataIndex: 'buyAvgAmount', label: '买量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
                 {
                     title: '买量单日付费100+人数', dataIndex: 'buyHundredUserNum', label: '买量付费数据', align: 'center', width: 90, sorter: true,
@@ -387,10 +387,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '自然量账面客单价', dataIndex: 'natureAvgAmount', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
 
                 {
@@ -587,10 +587,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '总账面客单价', dataIndex: 'avgAmount', label: '总付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
 
                 {
@@ -643,10 +643,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '总新用户复充率', dataIndex: 'newUserAgainRate', label: '总付费数据', align: 'center', width: 70,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
-                {
-                    title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
                 {
                     title: '总新增注册ARPPU', dataIndex: 'regUserArpu', label: '总付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />

src/pages/gameDataStatistics/gameData/total/tableConfigBuy.tsx

@@ -188,10 +188,10 @@ function columnsBuy12(): { label: string, fieldSHow?: { label: string, saveField
                     title: '买量账面客单价', dataIndex: 'buyAvgAmount', label: '买量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
                 {
                     title: '买量单日付费100+人数', dataIndex: 'buyHundredUserNum', label: '买量付费数据', align: 'center', width: 90, sorter: true,
@@ -387,10 +387,10 @@ function columnsBuy12(): { label: string, fieldSHow?: { label: string, saveField
                     title: '自然量账面客单价', dataIndex: 'natureAvgAmount', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
 
                 {
@@ -582,10 +582,10 @@ function columnsBuy12(): { label: string, fieldSHow?: { label: string, saveField
                     title: '总账面客单价', dataIndex: 'avgAmount', label: '总付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
 
                 {
@@ -638,10 +638,10 @@ function columnsBuy12(): { label: string, fieldSHow?: { label: string, saveField
                     title: '总新用户复充率', dataIndex: 'newUserAgainRate', label: '总付费数据', align: 'center', width: 70,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
-                {
-                    title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
                 {
                     title: '总新增注册ARPPU', dataIndex: 'regUserArpu', label: '总付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />

src/pages/gameDataStatistics/gameData/total/tableConfigNature.tsx

@@ -185,10 +185,10 @@ function columnsNature12(): { label: string, fieldSHow?: { label: string, saveFi
                     title: '买量账面客单价', dataIndex: 'buyAvgAmount', label: '买量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '买量复充率', dataIndex: 'buyUserAgainRate', label: '买量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
                 {
                     title: '买量单日付费100+人数', dataIndex: 'buyHundredUserNum', label: '买量付费数据', align: 'center', width: 90, sorter: true,
@@ -384,10 +384,10 @@ function columnsNature12(): { label: string, fieldSHow?: { label: string, saveFi
                     title: '自然量账面客单价', dataIndex: 'natureAvgAmount', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '自然量复充率', dataIndex: 'natureUserAgainRate', label: '自然量付费数据', align: 'center', width: 70,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
 
                 {
@@ -584,10 +584,10 @@ function columnsNature12(): { label: string, fieldSHow?: { label: string, saveFi
                     title: '总账面客单价', dataIndex: 'avgAmount', label: '总付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                {
-                    title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总复充率', dataIndex: 'userAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
 
                 {
                     title: '总单日付费100+人数', dataIndex: 'hundredUserNum', label: '总付费数据', align: 'center', width: 90, sorter: true,
@@ -638,10 +638,10 @@ function columnsNature12(): { label: string, fieldSHow?: { label: string, saveFi
                     title: '总新用户复充率', dataIndex: 'newUserAgainRate', label: '总付费数据', align: 'center', width: 70,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
-                {
-                    title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
-                },
+                // {
+                //     title: '总当天复充率', dataIndex: 'todayAgainRate', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                //     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                // },
                 {
                     title: '总新增注册ARPPU', dataIndex: 'regUserArpu', label: '总付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />

src/pages/gameDataStatistics/order/index.tsx

@@ -32,14 +32,14 @@ const Order: React.FC = () => {
                     newQueryForm.zxPitcherId = pitcherId
                     if (regStartDay && regEndDay) {
                         newQueryForm.beginRegTime = regStartDay + ' 00:00:00'
-                        newQueryForm.endRegTime = regEndDay + ' 59:59:59'
+                        newQueryForm.endRegTime = regEndDay + ' 23:59:59'
                     } else {
                         delete newQueryForm.beginRegTime
                         delete newQueryForm.endRegTime
                     }
                     if (beginOrderTime && endOrderTime) {
                         newQueryForm.beginOrderTime = beginOrderTime + ' 00:00:00'
-                        newQueryForm.endOrderTime = endOrderTime + ' 59:59:59'
+                        newQueryForm.endOrderTime = endOrderTime + ' 23:59:59'
                     } else {
                         delete newQueryForm.beginOrderTime
                         delete newQueryForm.endOrderTime