bug：惠民卡代金券支付字段返回

刘帅

2026-09-21 6798c43df6ea28179c7a1cd737730482b2452812

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -31,6 +31,7 @@

import javax.annotation.Resource;
import javax.xml.crypto.Data;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -2174,13 +2175,16 @@
    public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee) {
        HashMap<String, Object> map = new HashMap<>();
        String data = queryDataFee.getData();
        List<Integer> ids = queryDataFee.getIds();
        List<Integer> ids = queryDataFee.getIds() == null
                ? new ArrayList<>() : new ArrayList<>(queryDataFee.getIds());
        if (ids.size() == 0) {
            ids.add(-1);
        } else {

        }
        List<PointsMerchandise> list1 = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>().eq(PointsMerchandise::getRedemptionMethod, 3));
        // 只查询门票商品（type=3），并按购买记录关联的商品 ID 统计。
        // 旧逻辑会对每一笔订单遍历全部门票商品，导致日/月/季/年卡被重复累加。
        List<PointsMerchandise> tickets = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>()
                .eq(PointsMerchandise::getRedemptionMethod, 3)
                .eq(PointsMerchandise::getType, 3));
        LambdaQueryWrapper<UserPointsMerchandise> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if (ToolUtil.isNotEmpty(data)) {
            String stime = data.split(" - ")[0] + " 00:00:00";
@@ -2188,48 +2192,46 @@
            vipPaymentLambdaQueryWrapper.between(UserPointsMerchandise::getInsertTime, stime, etime);
        }
        vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getUserId, ids);
        List<Integer> collect = list1.stream().map(PointsMerchandise::getId).collect(Collectors.toList());
        List<Integer> collect = tickets.stream().map(PointsMerchandise::getId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
        }
        vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getPointsMerchandiseId, collect);
        vipPaymentLambdaQueryWrapper.eq(UserPointsMerchandise::getPayStatus, 2);
        ArrayList<Integer> objects = new ArrayList<>();
        vipPaymentLambdaQueryWrapper.and(wrapper -> wrapper.isNull(UserPointsMerchandise::getState)
                .or().eq(UserPointsMerchandise::getState, 1));
        List<UserPointsMerchandise> list = upmseService.list(vipPaymentLambdaQueryWrapper);

        double a = 0;
        double d = 0;
        double m = 0;
        double j = 0;
        double y = 0;
        Map<Integer, PointsMerchandise> ticketMap = tickets.stream()
                .collect(Collectors.toMap(PointsMerchandise::getId, ticket -> ticket, (first, ignored) -> first));
        BigDecimal all = BigDecimal.ZERO;
        BigDecimal day = BigDecimal.ZERO;
        BigDecimal month = BigDecimal.ZERO;
        BigDecimal quarter = BigDecimal.ZERO;
        BigDecimal year = BigDecimal.ZERO;
        for (UserPointsMerchandise userPointsMerchandise : list) {
            for (PointsMerchandise pointsMerchandise : list1) {
                if (pointsMerchandise.getId() == userPointsMerchandise.getPointsMerchandiseId()) {
                    a += pointsMerchandise.getCash().doubleValue();
                }
                if (pointsMerchandise.getType() == 3) {
                    if (pointsMerchandise.getCardType() == 1) {
                        d += pointsMerchandise.getCash().doubleValue();
                    }
                    if (pointsMerchandise.getCardType() == 2) {
                        m += pointsMerchandise.getCash().doubleValue();
                    }
                    if (pointsMerchandise.getCardType() == 3) {
                        j += pointsMerchandise.getCash().doubleValue();
                    }
                    if (pointsMerchandise.getCardType() == 4) {
                        y += pointsMerchandise.getCash().doubleValue();
                    }
                }
            PointsMerchandise ticket = ticketMap.get(userPointsMerchandise.getPointsMerchandiseId());
            if (ticket == null || userPointsMerchandise.getCash() == null) {
                continue;
            }

            BigDecimal paidCash = userPointsMerchandise.getCash();
            all = all.add(paidCash);
            if (Integer.valueOf(1).equals(ticket.getCardType())) {
                day = day.add(paidCash);
            } else if (Integer.valueOf(2).equals(ticket.getCardType())) {
                month = month.add(paidCash);
            } else if (Integer.valueOf(3).equals(ticket.getCardType())) {
                quarter = quarter.add(paidCash);
            } else if (Integer.valueOf(4).equals(ticket.getCardType())) {
                year = year.add(paidCash);
            }
        }

        map.put("all", a);
        map.put("day", d);
        map.put("month", m);
        map.put("quarter", j);
        map.put("year", y);
        map.put("all", all);
        map.put("day", day);
        map.put("month", month);
        map.put("quarter", quarter);
        map.put("year", year);
        return map;