增加数据类型的查询条件

src/api/lb-daily-user-trade.js

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+const LONG_REQUEST_TIMEOUT = 5 * 60 * 1000
+
 export function getLbDailyUserTradeList(params) {
   return request({
     url: '/lbDailyUserTrade/list',
@@ -59,9 +61,22 @@ export function importLbDailyUserTrade(file, defaultReportDate, tenantId) {
   return request({
     url: '/lbDailyUserTrade/import',
     method: 'post',
+    timeout: LONG_REQUEST_TIMEOUT,
     data: formData,
     headers: {
       'Content-Type': 'multipart/form-data'
     }
   })
 }
+
+export function calculateReportByDateAndTenant(reportDate, tenantId) {
+  return request({
+    url: '/lbDailyUserTrade/calculate-report/by-date-and-tenant',
+    method: 'post',
+    timeout: LONG_REQUEST_TIMEOUT,
+    params: {
+      reportDate,
+      tenantId
+    }
+  })
+}

src/views/lb-business/daily-report/index.vue

@@ -2,9 +2,6 @@
   <div class="app-container">
     <el-card class="filter-container" shadow="never">
       <el-form :model="queryParams" :inline="true" label-width="100px">
-        <el-form-item label="租户ID">
-          <el-input v-model="queryParams.tenantId" clearable placeholder="请输入租户ID" style="width: 180px" />
-        </el-form-item>
         <el-form-item label="用户ID">
           <el-input v-model="queryParams.userId" clearable placeholder="请输入用户ID" style="width: 180px" />
         </el-form-item>
@@ -12,7 +9,10 @@
           <el-input v-model="queryParams.nickname" clearable placeholder="请输入昵称" style="width: 180px" />
         </el-form-item>
         <el-form-item label="数据类型">
-          <el-input v-model="queryParams.dataType" clearable placeholder="请输入数据类型" style="width: 180px" />
+          <el-select v-model="queryParams.dataType" clearable placeholder="请选择数据类型" style="width: 180px">
+            <el-option label="详情" value="report_detail" />
+            <el-option label="汇总" value="report_sum" />
+          </el-select>
         </el-form-item>
         <el-form-item label="报表开始">
           <el-date-picker
@@ -34,26 +34,6 @@
             style="width: 200px"
           />
         </el-form-item>
-        <el-form-item label="创建开始">
-          <el-date-picker
-            v-model="queryParams.createdStartTime"
-            type="datetime"
-            clearable
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="创建开始时间"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item label="创建结束">
-          <el-date-picker
-            v-model="queryParams.createdEndTime"
-            type="datetime"
-            clearable
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="创建结束时间"
-            style="width: 200px"
-          />
-        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
           <el-button icon="el-icon-delete" @click="resetQuery">清空</el-button>
@@ -67,21 +47,19 @@
 
     <el-card class="table-container" shadow="never">
       <el-table v-loading="loading" :data="list" style="width: 100%">
-        <el-table-column label="租户ID" prop="tenantId" min-width="140" show-overflow-tooltip />
+        <el-table-column label="报表日期" prop="reportDate" min-width="170">
-        <el-table-column label="用户ID" prop="userId" min-width="140" show-overflow-tooltip />
+          <template slot-scope="scope">
+            {{ formatDate(scope.row.reportDate) }}
+          </template>
+        </el-table-column>
         <el-table-column label="昵称" prop="nickname" min-width="120" />
         <el-table-column label="昨日买入金额" prop="yestodaySellAmt" min-width="130" />
         <el-table-column label="当日卖出金额" prop="dailySellAmt" min-width="130" />
         <el-table-column label="当日买入金额" prop="dailyBuyAmt" min-width="130" />
         <el-table-column label="服务费" prop="serviceAmt" min-width="100" />
-        <el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
         <el-table-column label="差额" prop="diffAmt" min-width="100" />
+        <el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
         <el-table-column label="数据类型" prop="dataType" min-width="100" />
-        <el-table-column label="报表日期" prop="reportDate" min-width="170">
-          <template slot-scope="scope">
-            {{ formatDateTime(scope.row.reportDate) }}
-          </template>
-        </el-table-column>
         <el-table-column label="描述" prop="descContent" min-width="140" show-overflow-tooltip />
         <el-table-column label="创建时间" prop="createdAt" min-width="170">
           <template slot-scope="scope">
@@ -204,6 +182,23 @@ import {
   updateLbDailyUserTradeReport
 } from '@/api/lb-daily-user-trade-report'
 
+function formatDateTimeForQuery(date) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day} 00:00:00`
+}
+
+function getDefaultReportRange() {
+  const today = new Date()
+  const yesterday = new Date(today)
+  yesterday.setDate(yesterday.getDate() - 1)
+  return {
+    reportStartTime: formatDateTimeForQuery(yesterday),
+    reportEndTime: formatDateTimeForQuery(today)
+  }
+}
+
 export default {
   name: 'LbDailyReport',
   data() {
@@ -218,14 +213,10 @@ export default {
       queryParams: {
         current: 1,
         size: 10,
-        tenantId: '',
         userId: '',
         dataType: '',
         nickname: '',
-        reportStartTime: '',
+        ...getDefaultReportRange()
-        reportEndTime: '',
-        createdStartTime: '',
-        createdEndTime: ''
       },
       form: {
         id: '',
@@ -276,14 +267,11 @@ export default {
       const params = {
         current: this.queryParams.current,
         size: this.queryParams.size,
-        tenantId: this.queryParams.tenantId || undefined,
         userId: this.queryParams.userId || undefined,
         dataType: this.queryParams.dataType || undefined,
         nickname: this.queryParams.nickname || undefined,
         reportStartTime: this.queryParams.reportStartTime || undefined,
-        reportEndTime: this.queryParams.reportEndTime || undefined,
+        reportEndTime: this.queryParams.reportEndTime || undefined
-        createdStartTime: this.queryParams.createdStartTime || undefined,
-        createdEndTime: this.queryParams.createdEndTime || undefined
       }
       Object.keys(params).forEach((key) => {
         if (params[key] === undefined || params[key] === '') delete params[key]
@@ -298,14 +286,10 @@ export default {
       this.queryParams = {
         current: 1,
         size: 10,
-        tenantId: '',
         userId: '',
         dataType: '',
         nickname: '',
-        reportStartTime: '',
+        ...getDefaultReportRange()
-        reportEndTime: '',
-        createdStartTime: '',
-        createdEndTime: ''
       }
       this.fetchList()
     },
@@ -441,6 +425,15 @@ export default {
       const minutes = String(date.getMinutes()).padStart(2, '0')
       const seconds = String(date.getSeconds()).padStart(2, '0')
       return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+    },
+    formatDate(dateTime) {
+      if (!dateTime) return '-'
+      const date = new Date(String(dateTime).replace('T', ' '))
+      if (Number.isNaN(date.getTime())) return String(dateTime)
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
     }
   }
 }

src/views/lb-business/daily-trade/index.vue

@@ -31,6 +31,7 @@
     <el-card class="action-container" shadow="never">
       <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
       <el-button type="success" icon="el-icon-upload2" :loading="importLoading" @click="openImportDialog">导入数据</el-button>
+      <el-button type="warning" icon="el-icon-data-analysis" :loading="prepareReportLoading" @click="openPrepareReportDialog">准备报表数据</el-button>
       <el-button type="danger" icon="el-icon-delete" :loading="deleteByDateLoading" @click="openDeleteByDateDialog">按日期删除</el-button>
     </el-card>
 
@@ -192,6 +193,23 @@
         <el-button type="danger" :loading="deleteByDateLoading" @click="submitDeleteByDate">确定删除</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="准备报表数据" :visible.sync="prepareReportDialogVisible" width="480px" @close="resetPrepareReportForm">
+      <el-form ref="prepareReportFormRef" :model="prepareReportForm" :rules="prepareReportRules" label-width="120px">
+        <el-form-item label="报表日期" prop="reportDate">
+          <el-date-picker
+            v-model="prepareReportForm.reportDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择报表日期"
+            style="width: 100%"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="prepareReportDialogVisible = false">取消</el-button>
+        <el-button type="primary" :loading="prepareReportLoading" @click="submitPrepareReport">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -206,6 +224,7 @@ function getLocalTodayDateString() {
 
 import {
   addLbDailyUserTrade,
+  calculateReportByDateAndTenant,
   deleteLbDailyUserTradeByDateAndTenant,
   deleteLbDailyUserTrade,
   getLbDailyUserTradeList,
@@ -222,11 +241,13 @@ export default {
       submitLoading: false,
       importLoading: false,
       deleteByDateLoading: false,
+      prepareReportLoading: false,
       list: [],
       total: 0,
       dialogVisible: false,
       importDialogVisible: false,
       deleteByDateDialogVisible: false,
+      prepareReportDialogVisible: false,
       dialogTitle: '',
       isEdit: false,
       importFileList: [],
@@ -269,6 +290,12 @@ export default {
       },
       deleteByDateRules: {
         reportDate: [{ required: true, message: '请选择导入日期', trigger: 'change' }]
+      },
+      prepareReportForm: {
+        reportDate: getLocalTodayDateString()
+      },
+      prepareReportRules: {
+        reportDate: [{ required: true, message: '请选择报表日期', trigger: 'change' }]
       }
     }
   },
@@ -393,6 +420,13 @@ export default {
         if (this.$refs.deleteByDateFormRef) this.$refs.deleteByDateFormRef.clearValidate()
       })
     },
+    openPrepareReportDialog() {
+      this.prepareReportForm.reportDate = getLocalTodayDateString()
+      this.prepareReportDialogVisible = true
+      this.$nextTick(() => {
+        if (this.$refs.prepareReportFormRef) this.$refs.prepareReportFormRef.clearValidate()
+      })
+    },
     handleImportFileChange(file, fileList) {
       this.importFileList = fileList.slice(-1)
       this.importForm.file = this.importFileList.length > 0 ? this.importFileList[0].raw : null
@@ -468,6 +502,31 @@ export default {
         reportDate: ''
       }
     },
+    submitPrepareReport() {
+      this.$refs.prepareReportFormRef.validate((valid) => {
+        if (!valid) return
+        const tenantId = this.getTenantIdFromBusinessHeaders()
+        if (!tenantId) {
+          this.$message.error('未获取到租户ID，请先登录或切换到正确租户后重试')
+          return
+        }
+        this.prepareReportLoading = true
+        calculateReportByDateAndTenant(this.prepareReportForm.reportDate, tenantId)
+          .then((res) => {
+            this.$message.success(res.message || '报表数据准备成功')
+            this.prepareReportDialogVisible = false
+          })
+          .finally(() => {
+            this.prepareReportLoading = false
+          })
+      })
+    },
+    resetPrepareReportForm() {
+      if (this.$refs.prepareReportFormRef) this.$refs.prepareReportFormRef.resetFields()
+      this.prepareReportForm = {
+        reportDate: getLocalTodayDateString()
+      }
+    },
     getTenantIdFromBusinessHeaders() {
       const headers = getBusinessHeaders()
       const value = headers && headers['X-Tenant-Id']