From 474724c0e016be419fe84967fdcb085722e6b444 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 11:20:12 +0800
Subject: [PATCH] bug：营收统计数据修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 8dafa9e..469ca6f 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -1012,10 +1012,11 @@
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- vipPaymentLambdaQueryWrapper.between(PaymentCompetition::getInsertTime, stime, etime);
+ vipPaymentLambdaQueryWrapper.between(PaymentCompetition::getPayTime, stime, etime);
}
vipPaymentLambdaQueryWrapper.in(PaymentCompetition::getCompetitionId, ids);
vipPaymentLambdaQueryWrapper.eq(PaymentCompetition::getPayStatus, 2);
+ vipPaymentLambdaQueryWrapper.eq(PaymentCompetition::getState, 1);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
@@ -1212,10 +1213,8 @@
private LambdaQueryWrapper<Competition> buildCompetitionCountWrapper(CompetionVO vo, String dateText) {
LambdaQueryWrapper<Competition> wrapper = new LambdaQueryWrapper<Competition>()
.like(Competition::getInsertTime, dateText);
- // 平台统计由平台门店范围决定，历史平台赛事的 operatorId 可能为空或为 0。
- if (vo.getOperatorId() != null && !Integer.valueOf(0).equals(vo.getOperatorId())) {
- wrapper.eq(Competition::getOperatorId, vo.getOperatorId());
- }
+ // 运营商活动统计以其名下门店为准。历史活动的 operatorId 可能为空或未同步，
+ // 不能再以该字段过滤，否则活动管理列表能看到的门店活动会被统计遗漏。
appendStoreIdFilter(wrapper, vo.getStoreIds());
return wrapper;
}
--
Gitblit v1.7.1