From fcaf0dc9be440c1f3584771651a8b120c108d25d Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 17 Nov 2026 14:34:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:zap:=20=E6=AF=9B=E5=88=A9=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=88=86=E9=A1=B5=E5=A4=8D=E7=94=A8=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E5=B9=B6=E7=A6=81=E7=94=A8=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/web/controller/report/PrcProfitReportController.java | 3 +++ bms-front/src/views/report/profit/index.vue | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java index 23d94dde..f6f55a78 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/PrcProfitReportController.java @@ -8,6 +8,7 @@ import java.nio.file.Paths; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; +import com.github.pagehelper.PageHelper; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -105,6 +106,8 @@ public class PrcProfitReportController extends BaseController public TableDataInfo orders(PrcProfitReportQuery query) { startPage(); + // 分页总数由页面复用汇总订单数,订单明细仅执行分页查询。 + PageHelper.getLocalPage().setCount(false); List rows = profitReportService.selectOrderRows(query); return getDataTable(rows); } diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 89d47b12..46a01319 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -277,7 +277,8 @@ const hasSearched = ref(false) const exporting = ref(false) const pageNum = ref(1) const pageSize = ref(10) -const total = ref(0) +// 汇总按币种分组,分页总数复用各币种订单数之和。 +const total = computed(() => summaryList.value.reduce((count, summary) => count + Number(summary.orderCount || 0), 0)) /* 提成表单状态与初始化暂停使用,保留代码便于恢复。 const commissionDialogVisible = ref(false) const commissionLoading = ref(false) @@ -377,7 +378,6 @@ function loadRows() { return listProfitOrders(buildQuery()).then(res => { if (requestVersion !== rowsRequestVersion) return rows.value = res.rows || [] - total.value = res.total || 0 }).finally(() => { if (requestVersion === rowsRequestVersion) loading.value = false }) @@ -390,7 +390,6 @@ function clearReportResults() { summaryList.value = [] summaryLoaded.value = false rows.value = [] - total.value = 0 loading.value = false } From e104c5a3e9c777024d41b012f369697e4f21e7e4 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 17 Nov 2026 14:42:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bms-front/src/views/report/profit/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bms-front/src/views/report/profit/index.vue b/bms-front/src/views/report/profit/index.vue index 46a01319..ee01dfb1 100644 --- a/bms-front/src/views/report/profit/index.vue +++ b/bms-front/src/views/report/profit/index.vue @@ -141,7 +141,7 @@
- 订单明细 + 订单列表