wjx 1 tahun lalu
induk
melakukan
8f94e7045f

+ 4 - 2
src/components/QueryForm/index.tsx

@@ -142,7 +142,9 @@ interface Props {
         ranges?: any
     }
     /** 是否开启 充值到支付的间隔时间 搜索 */
-    isPayIntervalTime?: boolean
+    isPayIntervalTime?: {
+        tips?: string
+    }
     /** 是否开启 留存数据的类型 搜索 */
     isActiveTypes?: boolean
 }
@@ -838,7 +840,7 @@ const QueryForm: React.FC<Props> = (props) => {
 
             {/* 单个充值日期搜索 */}
             {isPayIntervalTime && <Col><Form.Item name='regPayIntervalTime'>
-                <IntervalTime />
+                <IntervalTime {...isPayIntervalTime}/>
             </Form.Item></Col>}
 
             <Col>

+ 4 - 3
src/components/QueryForm/intervalTime.tsx

@@ -6,12 +6,13 @@ import React, { useEffect, useState } from "react"
 interface Props {
     value?: [number | undefined, number | undefined]
     onChange?: (value?: [number | undefined, number | undefined]) => void
+    tips?: string
 }
 /**
  * 时间区间
  * @returns 
  */
-const IntervalTime: React.FC<Props> = ({ value = [undefined, undefined], onChange }) => {
+const IntervalTime: React.FC<Props> = ({ value = [undefined, undefined], onChange, tips }) => {
 
     /********************************************/
     const [data, setData] = useState<[number | undefined, number | undefined]>([undefined, undefined])
@@ -36,9 +37,9 @@ const IntervalTime: React.FC<Props> = ({ value = [undefined, undefined], onChang
         <InputNumber value={data[0]} style={{ width: 110 }} min={0} placeholder="最小间隔时间" onChange={(num) => handleOk(num, 0)} />
         ~
         <InputNumber value={data[1]} style={{ width: 110 }} min={0} placeholder="最大间隔时间" onChange={(num) => handleOk(num, 1)} />
-        <Tooltip title="充值距注册时间区间(分钟)">
+        {tips && <Tooltip title={tips}>
             <QuestionCircleOutlined />
-        </Tooltip>
+        </Tooltip>}
     </Space>
 }
 

+ 1 - 1
src/pages/gameDataStatistics/order/index.tsx

@@ -87,7 +87,7 @@ const Order: React.FC = () => {
                 isPayStatus
                 isGameUserId
                 isUserName
-                isPayIntervalTime
+                isPayIntervalTime={{ tips: '充值距注册时间区间(分钟)' }}
                 isAgentId
                 payTimeDay={{ ranges: getPresets() }}
                 isRegDay={{ ranges: getPresets() }}

+ 6 - 1
src/pages/gameDataStatistics/rankingList/gamer/index.tsx

@@ -25,7 +25,7 @@ const Gamer: React.FC = () => {
                 initialValues={{ sourceSystem: 'ZX_ONE', rechargeDay: [moment(), moment()] }}
                 onChange={(data: any) => {
                     console.log(data)
-                    const { rechargeDay, beginDay, endDay, ...par } = data
+                    const { rechargeDay, beginDay, endDay, regPayIntervalTime, ...par } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     if (rechargeDay && rechargeDay?.length === 2) {
@@ -40,10 +40,15 @@ const Gamer: React.FC = () => {
                             delete newQueryForm['endDay']
                         }
                     }
+                    if (regPayIntervalTime?.length > 0 && (regPayIntervalTime[0] || regPayIntervalTime[1])) {
+                        newQueryForm.latestAmountUntilNowTimeMin = regPayIntervalTime[0]
+                        newQueryForm.latestAmountUntilNowTimeMax = regPayIntervalTime[1]
+                    }
                     setQueryForm({ ...newQueryForm, ...par })
                 }}
                 isSource
                 rechargeDay={{ ranges: getPresetsRanking() }}
+                isPayIntervalTime={{ tips: '最近充值时间距今的间隔时间' }}
             />}
             scroll={{ x: 1000, y: 600 }}
             ajax={getRechargeUserList}

+ 2 - 0
src/services/gameData/rankingList.ts

@@ -51,6 +51,8 @@ export interface UserRechargeListType extends Paging {
     endDay?: string,    // 结束日期
     companyId?: number, // 公司ID
     sysUserId?: number  // 投手ID
+    latestAmountUntilNowTimeMin?: number
+    latestAmountUntilNowTimeMax?: number
 }
 export async function getRechargeUserListApi(data: UserRechargeListType) {
     return request(wapi + `/ranking/player`, {