fix

src/components/QueryForm/index.tsx

@@ -124,6 +124,10 @@ interface Props {
     rechargeDay?: {
         ranges?: any
     }
+    /** 最近充值 */
+    LastRechargeDay?: {
+        ranges?: any
+    },
     /** 是否开启 支付时间 搜索 */
     payTimeDay?: {
         ranges?: any
@@ -268,7 +272,7 @@ const QueryForm: React.FC<Props> = (props) => {
     const {
         onChange, initialValues, isSource, isAccount, isAccountId, isAccountIds, isCompanyId, isAgentKey, isAgentName, isCpId, isCpName, isCpOrderId, isCpStatus, isCreateDay, isCreateDayXz, isDevice, isGameName, isRechargeGameName, isGameId, isGameIds, isOrderGameId, isGameRoleId,
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isParentIds, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
-        isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isSysUserIds, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
+        isSysUserName, isRechargeDate, LastRechargeDay, isBGGameClassify, isGameUserId, isSysUserId, isSysUserIds, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isRoleLevel, isCreateRoleDay, isLastActiveTime, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
         isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isIsParticipateMerge, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem, isOrderLy, isAddCorpWechat,
         isWakeUp, isBackStatus, isGameDimension, isUserLastRegTime, isUserLastRegAgentId, isUserLastPitcherId, isRechargeAmountWithin24h, isRechargeTotalAmountWithin24h, isRegisterType
@@ -1638,6 +1642,10 @@ const QueryForm: React.FC<Props> = (props) => {
                 <DatePicker.RangePicker style={{ width: 230 }} placeholder={['充值开始日期', '充值结束日期']} {...rechargeDay} />
             </Form.Item></Col>}
 
+            {LastRechargeDay && <Col><Form.Item name='LastRechargeDay'>
+                <DatePicker.RangePicker style={{ width: 230 }} placeholder={['最近充值开始日期', '最近充值结束日期']} {...LastRechargeDay} />
+            </Form.Item></Col>}
+
             {/* 单个充值日期搜索 */}
             {payTimeDay && <Col><Form.Item name='payTime'>
                 <DatePicker.RangePicker style={{ width: 230 }} placeholder={['支付开始日期', '支付结束日期']} {...payTimeDay} />

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, roleCount, lastActiveTime, agentId, regStartDay, regEndDay, ...par } = data
+                    const { rechargeDay, createRoleDay, superParentGameId, mobile, regPayIntervalTime, LastRechargeDay, lastActiveTime, agentId, regStartDay, regEndDay, ...par } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.phone = mobile
@@ -131,19 +131,23 @@ const RoleRechargeRanking: React.FC = () => {
                         delete newQueryForm['lastActiveTimeMin']
                         delete newQueryForm['lastActiveTimeMax']
                     }
+                    if (LastRechargeDay && LastRechargeDay?.length === 2) {
+                        newQueryForm['roleLastPayTimeMin'] = moment(LastRechargeDay[0]).format('YYYY-MM-DD')
+                        newQueryForm['roleLastPayTimeMax'] = moment(LastRechargeDay[1]).format('YYYY-MM-DD')
+                    } else {
+                        delete newQueryForm['roleLastPayTimeMin']
+                        delete newQueryForm['roleLastPayTimeMax']
+                    }
                     if (regPayIntervalTime?.length > 0 && (regPayIntervalTime[0] || regPayIntervalTime[1])) {
                         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
                 rechargeDay={{ ranges: getPresetsRanking() }}
                 isCreateRoleDay={{ ranges: getPresetsRanking() }}
+                LastRechargeDay={{}}
                 isSuperParentGameId
                 isParentIds
                 isGameIds
@@ -164,7 +168,6 @@ const RoleRechargeRanking: React.FC = () => {
                 isRemoveGame
                 isRemoveGameForSystem
                 isPayIntervalTime={{ tips: '角色累计充值金额区间（单位：元）' }}
-                isRoleCount={{ tips: '角色最近充值时间区间（单位：分钟）' }}
                 isAddCorpWechat
                 isWakeUp
                 isOs