From 620a310bdcfb1d8f1b49bf163413afeb522e1b2f Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 21:47:53 +0800
Subject: [PATCH] bug：收入类型统计数据问题解决
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 181 +++++++++++++++++++++++++++++++-------------
1 files changed, 127 insertions(+), 54 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 4edd750..2fd0be0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -82,8 +82,29 @@
}
/**
- * 运营商统计的门店范围：平台（0）统计平台门店，其他值统计对应运营商门店。
+ * 将门店统计目标限制在当前账号可见范围内。门店账号固定统计自身；运营商账号
+ * 只能统计归属自己的门店，避免其它门店的数据混入其统计结果。
*/
+ private Integer resolveStatisticsStoreId(Integer storeId) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (Integer.valueOf(3).equals(objectType)) {
+ return UserExt.getUser().getObjectId();
+ }
+ if (storeId == null) {
+ return null;
+ }
+ TStore store = storeService.getById(storeId);
+ if (store == null || Integer.valueOf(3).equals(store.getState())) {
+ return null;
+ }
+ if (Integer.valueOf(2).equals(objectType)
+ && !UserExt.getUser().getObjectId().equals(store.getOperatorId())) {
+ return null;
+ }
+ return storeId;
+ }
+
+ /** 平台（0）或运营商统计均以门店的 operatorId 作为唯一归属依据。 */
private List<TStore> listStatisticsStores(Integer operatorId, boolean enabledOnly) {
LambdaQueryWrapper<TStore> wrapper = new LambdaQueryWrapper<>();
if (enabledOnly) {
@@ -91,12 +112,19 @@
} else {
wrapper.ne(TStore::getState, 3);
}
- if (Integer.valueOf(0).equals(operatorId)) {
- wrapper.eq(TStore::getType, 1);
+ if (operatorId == null) {
+ // 平台统计：所有门店总和，不按门店所属运营商过滤。
} else {
- wrapper.eq(TStore::getType, 2).eq(TStore::getOperatorId, operatorId);
+ wrapper.eq(TStore::getOperatorId, operatorId);
}
return storeService.list(wrapper);
+ }
+
+ /** 空门店范围必须显式传递无匹配值，不能让下游 SQL 因空集合而省略 IN 条件。 */
+ private List<Integer> listStatisticsStoreIds(Integer operatorId, boolean enabledOnly) {
+ List<Integer> storeIds = listStatisticsStores(operatorId, enabledOnly).stream()
+ .map(TStore::getId).collect(Collectors.toList());
+ return storeIds.isEmpty() ? Collections.singletonList(-1) : storeIds;
}
/** 获取统计范围门店发生课程、订场或赛事消费的用户。 */
@@ -116,6 +144,30 @@
.stream().map(SiteBooking::getAppUserId).filter(Objects::nonNull)
.collect(Collectors.toList()));
List<Integer> competitionUserIds = competitionClient.queryAppUserId(storeIds);
+ if (competitionUserIds != null) {
+ userIds.addAll(competitionUserIds);
+ }
+ List<Integer> validUserIds = userIds.stream().filter(Objects::nonNull).distinct()
+ .collect(Collectors.toList());
+ return validUserIds.isEmpty() ? Collections.singletonList(-1) : validUserIds;
+ }
+
+ private List<Integer> listStatisticsAppUserIdsForStore(Integer storeId) {
+ if (storeId == null) {
+ return Collections.singletonList(-1);
+ }
+ List<Integer> userIds = new ArrayList<>();
+ List<Integer> courseUserIds = coursePackagePaymentClient.queryPaymentCoursePackage(
+ Collections.singletonList(storeId));
+ if (courseUserIds != null) {
+ userIds.addAll(courseUserIds);
+ }
+ userIds.addAll(siteBookingService.list(new QueryWrapper<SiteBooking>()
+ .eq("storeId", storeId).eq("state", 1))
+ .stream().map(SiteBooking::getAppUserId).filter(Objects::nonNull)
+ .collect(Collectors.toList()));
+ List<Integer> competitionUserIds = competitionClient.queryAppUserId(
+ Collections.singletonList(storeId));
if (competitionUserIds != null) {
userIds.addAll(competitionUserIds);
}
@@ -238,6 +290,23 @@
} else if (Integer.valueOf(2).equals(roleType)) {
operatorId = objectId;
storeId = resolveStoreId(storeId);
+ }
+
+ // 下游多处查询会在门店集合为空时忽略门店过滤。运营商没有任何门店时，
+ // 直接返回完整的零值结构，避免被误统计为全平台数据。
+ if (operatorId != null && storeId == null
+ && storeService.count(new LambdaQueryWrapper<TStore>()
+ .eq(TStore::getOperatorId, operatorId)
+ .ne(TStore::getState, 3)) == 0) {
+ Map<String, Object> emptyIncomeData = buildIncomeStatistics(Collections.emptyList());
+ emptyIncomeData.put("incomeTypeNet", buildIncomeTypeNet(Collections.emptyList(), null));
+ Map<String, Object> emptyTicketIncome = new HashMap<>();
+ emptyTicketIncome.put("day", BigDecimal.ZERO);
+ emptyTicketIncome.put("month", BigDecimal.ZERO);
+ emptyTicketIncome.put("quarter", BigDecimal.ZERO);
+ emptyTicketIncome.put("year", BigDecimal.ZERO);
+ emptyIncomeData.put("ticketIncome", emptyTicketIncome);
+ return emptyIncomeData;
}
// 参数代表当前统计目标，而非当前登录人的角色；平台账号查看运营商/门店页时，
@@ -448,12 +517,9 @@
}
}
- Map<Long, BigDecimal> couponDeductionAmounts = getCouponDeductionAmounts(usedCouponIds);
- applyCouponDeductions(incomeVOS, couponDeductionAmounts);
-
// 惠民卡和优惠券购买不归属到单一课程/场地门店，当前仅在平台或运营商汇总中计入。
if (storeId == null) {
- appendHuiminIncome(incomeVOS, operatorId);
+ appendHuiminIncome(incomeVOS, operatorId, usedCouponIds);
if (operatorId == null) {
appendCouponPurchaseIncome(incomeVOS);
}
@@ -468,9 +534,15 @@
temp.setInsertTime(pointMerchandiseIncomeVo.getInsertTime());
if (pointMerchandiseIncomeVo.getCash()!=null){
temp.setAmount(pointMerchandiseIncomeVo.getCash());
+ if (pointMerchandiseIncomeVo.getUserCouponId() != null) {
+ usedCouponIds.add(pointMerchandiseIncomeVo.getUserCouponId());
+ temp.setId(pointMerchandiseIncomeVo.getUserCouponId().toString());
+ }
incomeVOS.add(temp);
}
}
+ Map<Long, BigDecimal> couponDeductionAmounts = getCouponDeductionAmounts(usedCouponIds);
+ applyCouponDeductions(incomeVOS, couponDeductionAmounts);
// 平台智慧球场
if (storeId==null&&operatorId==null){
gameDataQuery.setObjectId(0);
@@ -515,20 +587,24 @@
// 门票饼图需要日/月/季/年卡拆分；此前该数据只在 type1 内部返回，
// 现随统一营收接口返回，供平台页直接使用。
monthlyData.put("ticketIncome", getTicketIncome(time, operatorId, storeId));
+ // 平台收入类型饼图还需要课程、订场分类明细。此前页面只能读取 type1
+ // 的模板数据，筛选后 getIncomeData 缺少该字段，导致课程图显示为空。
+ if (operatorId == null && storeId == null) {
+ Map<String, Object> platformTypeData = (Map<String, Object>) type1(time);
+ monthlyData.put("courseData", platformTypeData.get("courseData"));
+ monthlyData.put("siteData", platformTypeData.get("siteData"));
+ }
return monthlyData;
}
private Map<String, Object> getTicketIncome(String time, Integer operatorId, Integer storeId) {
List<Integer> userIds;
if (storeId != null) {
- userIds = appUserClient.getUserStore(storeId);
+ userIds = listStatisticsAppUserIdsForStore(storeId);
} else if (operatorId != null) {
- userIds = appUserClient.getUserYYs(operatorId);
+ userIds = listStatisticsAppUserIds(operatorId);
} else {
- List<Integer> platformUserIds = sysUserService.list(new LambdaQueryWrapper<User>()
- .eq(User::getObjectType, 1))
- .stream().map(User::getId).collect(Collectors.toList());
- userIds = appUserClient.getUserPt(platformUserIds);
+ userIds = listStatisticsAppUserIds(null);
}
if (userIds == null) {
userIds = new ArrayList<>();
@@ -538,7 +614,7 @@
}
/** 惠民卡采用支付、退款两条事实流水，赠送卡不计营收。 */
- private void appendHuiminIncome(List<IncomeVO> incomeRecords, Integer operatorId) {
+ private void appendHuiminIncome(List<IncomeVO> incomeRecords, Integer operatorId, Set<Long> usedCouponIds) {
HuiminPayQuery query = new HuiminPayQuery();
query.setGiftPaymentType(3);
if (operatorId != null) {
@@ -556,6 +632,10 @@
payment.setIncomeType(6);
payment.setInsertTime(record.getPaymentTime());
payment.setAmount(record.getSalesMoney());
+ if (record.getUserCouponId() != null) {
+ usedCouponIds.add(record.getUserCouponId());
+ payment.setId(record.getUserCouponId().toString());
+ }
incomeRecords.add(payment);
if (Integer.valueOf(3).equals(record.getStatus())
|| Integer.valueOf(2).equals(record.getRefundStatus())
@@ -895,10 +975,7 @@
@ResponseBody
public Object backPt(Integer type) {
HashMap<String, Object> map = new HashMap<>();
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(1));
- if(userPt.size()==0){
- userPt.add(-1);
- }
+ List<Integer> userPt = listStatisticsAppUserIds(null);
ArrayList<Object> integers = new ArrayList<>();
int year = DateUtil.year(new Date());
List<TBackRecord> thisYear = backRecordService.list(new LambdaQueryWrapper<TBackRecord>().like(TBackRecord::getTime, year).in(TBackRecord::getUserId,userPt));
@@ -1101,7 +1178,8 @@
@RequestMapping(value = "/backStore")
@ResponseBody
public Object backStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStatisticsStoreId(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1220,15 +1298,16 @@
@RequestMapping(value = "/userAndVipPt")
@ResponseBody
public Object userAndVipPt(Integer type) {
- type=1;
- HashMap<String, Object> map = appUserClient.userAndVipPt(type);
+ // 平台用户统计按用户归属全量统计，不能以“已有消费记录”筛选，
+ // 否则会遗漏尚未在门店消费的新注册用户。
+ HashMap<String, Object> map = appUserClient.userAndVipPt(1);
return map;
}
@RequestMapping(value = "/stuPt")
@ResponseBody
public Object stuPt() {
- HashMap<String, Object> map = appUserClient.stuPt();
+ HashMap<String, Object> map = appUserClient.stuYys(listStatisticsAppUserIds(null));
return map;
}
@RequestMapping(value = "/stuYys")
@@ -1262,7 +1341,8 @@
@RequestMapping(value = "/stuStores")
@ResponseBody
public Object stuStores(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStatisticsStoreId(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1282,7 +1362,7 @@
@RequestMapping(value = "/coursePt")
@ResponseBody
public Object coursePt() {
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(1));
+ List<Integer> userPt = listStatisticsAppUserIds(null);
HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
return map;
}
@@ -1299,7 +1379,8 @@
@RequestMapping(value = "/courseStore")
@ResponseBody
public Object courseStore(Integer id) {
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id));
+ id = resolveStatisticsStoreId(id);
+ List<Integer> userPt = listStatisticsAppUserIdsForStore(id);
HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
return map;
}
@@ -1308,8 +1389,7 @@
@ResponseBody
public Object userAndVipYys(Integer id) {
id = resolveOperatorId(id);
- List<TStore> list4 = listStatisticsStores(id, true);
- List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
+ List<Integer> collect1 = listStatisticsStoreIds(id, true);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1327,7 +1407,8 @@
@RequestMapping(value = "/userAndVipStore")
@ResponseBody
public Object userAndVipStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStatisticsStoreId(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1345,10 +1426,10 @@
@RequestMapping(value = "/actPt")
@ResponseBody
public Object actPt(Integer type) {
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(1));
+ List<Integer> userPt = listStatisticsAppUserIds(null);
HashMap<String, Object> map = competitionClient.actPt(userPt);
- List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, 0).ne(TStore::getState, 3));
+ List<TStore> list = listStatisticsStores(null, false);
long l1=0;
for (TStore tStore : list) {
l1 += getStoreOperatingHours(tStore, new Date());
@@ -1361,8 +1442,7 @@
public Object actYys(Integer id) {
id = resolveOperatorId(id);
CompetionVO competionVO = new CompetionVO();
- List<TStore> list4 = listStatisticsStores(id, true);
- List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
+ List<Integer> collect1 = listStatisticsStoreIds(id, true);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1441,8 +1521,7 @@
// List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2));
// List<Integer> ids = list.stream().map(User::getId).collect(Collectors.toList());
// List<Integer> userIds = appUserClient.getUserYYs(id);
- List<TStore> list4 = listStatisticsStores(id, true);
- List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
+ List<Integer> collect1 = listStatisticsStoreIds(id, true);
QueryDataFee queryDataFee = new QueryDataFee(time, collect1);
// 课程收入
HashMap<String, Object> map3 = courseClient.queryFee(queryDataFee);
@@ -1462,7 +1541,7 @@
}else{
List<TSite> list = siteService.list(new QueryWrapper<TSite>().in("storeId", collect1).eq("state", 1));
ids = list.stream().map(TSite::getId).collect(Collectors.toList());
- if(collect1.size()==0){
+ if(ids.isEmpty()){
ids.add(-1);
}
}
@@ -1542,8 +1621,9 @@
@ResponseBody
@RequestMapping("/selectStore")
public Object selectStore(Integer id,String time) {
+ id = resolveStatisticsStoreId(id);
HashMap<String, Object> map = new HashMap<>();
- List<Integer> collect1 = Arrays.asList(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1692,10 +1772,8 @@
@ResponseBody
public Object type1(String time) {
HashMap<String, Object> map = new HashMap<>();
- // 找出平台的用户
- List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 1));
- List<Integer> ids = list.stream().map(User::getId).collect(Collectors.toList());
- List<Integer> userIds = appUserClient.getUserPt(ids);
+ // 平台统计是所有门店总和，用户范围同样来自所有门店的消费用户。
+ List<Integer> userIds = listStatisticsAppUserIds(null);
QueryDataFee queryDataFee = new QueryDataFee(time, userIds);
// 课程和赛事接口的 ids 参数表示门店 ID；不能把平台用户 ID 传入。
List<Integer> platformStoreIds = storeService.list(new LambdaQueryWrapper<TStore>()
@@ -1800,9 +1878,7 @@
@RequestMapping("/stuCourseData")
@ResponseBody
public Object stuCourseData() {
- ArrayList<Integer> objects = new ArrayList<>();
- objects.add(1);
- List<Integer> userIds = appUserClient.getUserPt(objects);
+ List<Integer> userIds = listStatisticsAppUserIds(null);
List<Map<String,Object>> list = coursePackagePaymentClient.queryCourseData(userIds);
ArrayList<Object> objects2 = new ArrayList<>();
ArrayList<Object> objects3 = new ArrayList<>();
@@ -1820,9 +1896,7 @@
@RequestMapping("/stuUserData")
@ResponseBody
public Object stuUserData() {
- ArrayList<Integer> objects = new ArrayList<>();
- objects.add(1);
- HashMap<String, Object> map = appUserClient.queryUserAge1();
+ HashMap<String, Object> map = appUserClient.queryUserAgeYys(listStatisticsAppUserIds(null));
return map;
}
@@ -1830,8 +1904,7 @@
@ResponseBody
public Object stuUserDataYys(Integer id) {
id = resolveOperatorId(id);
- List<TStore> list4 = listStatisticsStores(id, true);
- List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
+ List<Integer> collect1 = listStatisticsStoreIds(id, true);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1848,8 +1921,8 @@
@RequestMapping("/stuUserDataStore")
@ResponseBody
public Object stuUserDataStore(Integer id) {
-
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStatisticsStoreId(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1869,8 +1942,7 @@
@ResponseBody
public Object selectYysJx(Integer id) {
id = resolveOperatorId(id);
- List<TStore> list4 = listStatisticsStores(id, true);
- List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
+ List<Integer> collect1 = listStatisticsStoreIds(id, true);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1902,7 +1974,8 @@
@RequestMapping("/selectStoreJx")
@ResponseBody
public Object selectStoreJx(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStatisticsStoreId(id);
+ List<Integer> collect1 = Collections.singletonList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
--
Gitblit v1.7.1