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-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 5121290..b16df68 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -2173,30 +2173,63 @@
@PostMapping("/base/pointMerchars/queryFee")
@ResponseBody
public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee) {
+ return queryTicketFee(queryDataFee, false);
+ }
+
+ /**
+ * 按购买记录的 storeId 统计门票收入。购买表按 userId 分片，未带 userId 条件时
+ * ShardingSphere 会读取各分表，确保 t_user_points_merchandise1-5 的记录都参与统计。
+ */
+ @PostMapping("/base/pointMerchars/queryTicketFee")
+ @ResponseBody
+ public HashMap<String, Object> queryTicketFee(@RequestBody QueryDataFee queryDataFee) {
+ return queryTicketFee(queryDataFee, true);
+ }
+
+ private HashMap<String, Object> queryTicketFee(QueryDataFee queryDataFee, boolean scopeByStore) {
HashMap<String, Object> map = new HashMap<>();
String data = queryDataFee.getData();
List<Integer> ids = queryDataFee.getIds() == null
? new ArrayList<>() : new ArrayList<>(queryDataFee.getIds());
- if (ids.size() == 0) {
- ids.add(-1);
- }
- // 只查询门票商品（type=3），并按购买记录关联的商品 ID 统计。
- // 旧逻辑会对每一笔订单遍历全部门票商品，导致日/月/季/年卡被重复累加。
+ // cardType 是门票卡种的唯一分类依据：1 日卡、2 月卡、3 季卡、4 年卡。
+ // 不能额外依赖历史商品的 type/redemptionMethod，避免有效门票记录被遗漏。
List<PointsMerchandise> tickets = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>()
- .eq(PointsMerchandise::getRedemptionMethod, 3)
- .eq(PointsMerchandise::getType, 3));
+ .in(PointsMerchandise::getCardType, 1, 2, 3, 4));
LambdaQueryWrapper<UserPointsMerchandise> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- vipPaymentLambdaQueryWrapper.between(UserPointsMerchandise::getInsertTime, stime, etime);
+ // 实收以支付时间归属；没有支付时间的历史数据才回退到创建时间。
+ vipPaymentLambdaQueryWrapper.and(wrapper -> wrapper
+ .between(UserPointsMerchandise::getPaymentTime, stime, etime)
+ .or(item -> item.isNull(UserPointsMerchandise::getPaymentTime)
+ .between(UserPointsMerchandise::getInsertTime, stime, etime)));
}
- vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getUserId, ids);
+ if (!ids.isEmpty()) {
+ if (scopeByStore) {
+ // 门票记录通常写入 storeId；全国/城市通用等历史记录可能未写该字段，
+ // 此时按商品配置的门店关系归属到运营商/门店统计范围。
+ List<Integer> scopedTicketIds = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
+ .in(PointsMerchandiseStore::getStoreId, ids))
+ .stream().map(PointsMerchandiseStore::getPointsMerchandiseId)
+ .filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ vipPaymentLambdaQueryWrapper.and(wrapper -> {
+ wrapper.in(UserPointsMerchandise::getStoreId, ids);
+ if (!scopedTicketIds.isEmpty()) {
+ wrapper.or().in(UserPointsMerchandise::getPointsMerchandiseId, scopedTicketIds);
+ }
+ });
+ } else {
+ vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getUserId, ids);
+ }
+ }
List<Integer> collect = tickets.stream().map(PointsMerchandise::getId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
}
vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getPointsMerchandiseId, collect);
+ // payStatus=2 才表示支付成功；payType 是兑换/支付方式，不能固定为 2，
+ // 否则会把其它已支付门票记录错误排除。
vipPaymentLambdaQueryWrapper.eq(UserPointsMerchandise::getPayStatus, 2);
vipPaymentLambdaQueryWrapper.and(wrapper -> wrapper.isNull(UserPointsMerchandise::getState)
.or().eq(UserPointsMerchandise::getState, 1));
@@ -2214,16 +2247,18 @@
if (ticket == null || userPointsMerchandise.getCash() == null) {
continue;
}
- BigDecimal paidCash = userPointsMerchandise.getCash();
- all = all.add(paidCash);
+ // 以 t_user_points_merchandise1-5 中实际支付的 cash 为准，
+ // 不使用商品当前价格，避免商品改价影响历史营收。
+ BigDecimal ticketAmount = userPointsMerchandise.getCash();
+ all = all.add(ticketAmount);
if (Integer.valueOf(1).equals(ticket.getCardType())) {
- day = day.add(paidCash);
+ day = day.add(ticketAmount);
} else if (Integer.valueOf(2).equals(ticket.getCardType())) {
- month = month.add(paidCash);
+ month = month.add(ticketAmount);
} else if (Integer.valueOf(3).equals(ticket.getCardType())) {
- quarter = quarter.add(paidCash);
+ quarter = quarter.add(ticketAmount);
} else if (Integer.valueOf(4).equals(ticket.getCardType())) {
- year = year.add(paidCash);
+ year = year.add(ticketAmount);
}
}
--
Gitblit v1.7.1