fix

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

@@ -2,7 +2,7 @@ import { gameClassifyEnum } from "@/components/QueryForm/const"
 import WidthEllipsis from "@/components/widthEllipsis"
 import { Statistic } from "antd"
 import React from "react"
-
+import '../../adlist/monitor/index.less'
 
 function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
 
@@ -55,8 +55,45 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户充值金额', dataIndex: 'newUserAmount', label: '付费数据', align: 'center', width: 70, default: 6,
-                    render: (a: string) => <Statistic value={a || 0} />
+                    title: '新用户充值金额', dataIndex: 'newUserAmount', label: '付费数据', align: 'center', default: 6,
+                    children: [
+                        {
+                            title: '总', 
+                            dataIndex: 'newUserAmount',
+                            key: 'newUserAmount', 
+                            align: 'right', 
+                            width: 70, 
+                            className: 'adDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '支付宝', 
+                            dataIndex: 'alipayAmount', 
+                            key: 'alipayAmount', 
+                            align: 'right', 
+                            width: 80, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '微信', 
+                            dataIndex: 'wxAmount', 
+                            key: 'wxAmount', 
+                            align: 'right', 
+                            width: 70, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '米大师', 
+                            dataIndex: 'miMasterAmount', 
+                            key: 'miMasterAmount', 
+                            align: 'right', 
+                            width: 80, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        }
+                    ]
                 },
                 {
                     title: '新用户充值成本', dataIndex: 'newUserRechargeCost', label: '付费数据', align: 'center', width: 80, default: 14,
@@ -111,8 +148,45 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户累计充值金额', dataIndex: 'newUserTotalAmount', label: '付费数据', align: 'center', width: 70, sorter: true, default: 10,
-                    render: (a: string) => <Statistic value={a || 0} />
+                    title: '新用户累计充值金额', dataIndex: 'newUserTotalAmount', label: '付费数据', align: 'center', default: 10,
+                    children: [
+                        {
+                            title: '总', 
+                            dataIndex: 'newUserTotalAmount',
+                            key: 'newUserTotalAmount', 
+                            align: 'right', 
+                            width: 70, 
+                            className: 'adDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '支付宝累计(自然量)', 
+                            dataIndex: 'natureNewUserTotalZfbAmount', 
+                            key: 'natureNewUserTotalZfbAmount', 
+                            align: 'right', 
+                            width: 80, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '微信累计(自然量)', 
+                            dataIndex: 'natureNewUserTotalWxAmount', 
+                            key: 'natureNewUserTotalWxAmount', 
+                            align: 'right', 
+                            width: 70, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        },
+                        {
+                            title: '米大师累计(自然量)', 
+                            dataIndex: 'natureNewUserTotalMdsAmount', 
+                            key: 'natureNewUserTotalMdsAmount', 
+                            align: 'right', 
+                            width: 80, 
+                            className: 'payDataBackColorClass',
+                            render: (a: string) => <Statistic value={a || 0} />
+                        }
+                    ]
                 },
                 {
                     title: '首日充值成本', dataIndex: 'firstNewUserRechargeCost', label: '付费数据', align: 'center', width: 70, sorter: true, default: 15,

src/pages/gameDataStatistics/pitcher/everyDay/tableConfig.tsx

@@ -301,6 +301,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '新用户累计充值金额', dataIndex: 'buyNewUserTotalAmount', label: '付费数据', align: 'center', width: 70, sorter: true, default: 9,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
+                {
+                    title: '7日累充500+用户数', dataIndex: 'totalFiveHundredUserCount', label: '付费数据', align: 'center', width: 80, 
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
                 {
                     title: '首日ROI', dataIndex: 'firstRoi', label: '付费数据', align: 'center', width: 70, sorter: true, default: 10,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/index.tsx

@@ -102,7 +102,7 @@ const RoleRechargeRanking: React.FC = () => {
                 initialValues={{ sourceSystem: 'ZX_ONE', rechargeDay: [moment(), moment()] }}
                 onChange={(data: any) => {
                     setSelectedRowKeys([])
-                    const { rechargeDay, createRoleDay, superParentGameId, mobile, regPayIntervalTime, lastActiveTime, agentId, regStartDay, regEndDay, ...par } = data
+                    const { rechargeDay, createRoleDay, superParentGameId, mobile, regPayIntervalTime, roleCount, lastActiveTime, agentId, regStartDay, regEndDay, ...par } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.phone = mobile
@@ -135,6 +135,10 @@ const RoleRechargeRanking: React.FC = () => {
                         newQueryForm.totalRechargeMin = regPayIntervalTime[0]
                         newQueryForm.totalRechargeMax = regPayIntervalTime[1]
                     }
+                    if (roleCount?.length > 0 && (roleCount[0] || roleCount[1])) {
+                        newQueryForm.roleLastPayTimeMin = roleCount[0]
+                        newQueryForm.roleLastPayTimeMax = roleCount[1]
+                    }
                     setQueryForm({ ...newQueryForm, ...par })
                 }}
                 isSource
@@ -160,6 +164,7 @@ const RoleRechargeRanking: React.FC = () => {
                 isRemoveGame
                 isRemoveGameForSystem
                 isPayIntervalTime={{ tips: '角色累计充值金额区间（单位：元）' }}
+                isRoleCount={{ tips: '角色最近充值时间区间（单位：分钟）' }}
                 isAddCorpWechat
                 isWakeUp
                 isOs

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

@@ -134,7 +134,7 @@ function columns12(
                 { title: '角色累计充值次数', dataIndex: 'amount_count', label: '角色充值信息', align: 'center', width: 70, default: 14, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '24小时内单笔充值金额', dataIndex: 'role_amount', label: '角色充值信息', align: 'center', width: 80, render: (a: string) => <WidthEllipsis value={a?.toString()} /> },
                 { title: '24小时内累计充值总金额', dataIndex: 'role_total_amount', label: '角色充值信息', align: 'center', width: 85, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '角色最近充值时间', dataIndex: 'role_last_pay_time', label: '角色充值信息', align: 'center', width: 140, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '角色最近充值时间', dataIndex: 'role_last_pay_time', label: '角色充值信息', align: 'center', width: 140, sorter: true, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '角色最近活跃时间', dataIndex: 'role_active_time', label: '角色充值信息', align: 'center', width: 140, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 {
                     title: '角色注册充值时间差',