bug：统计数据修正

刘帅

2026-09-21 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java

@@ -9,6 +9,7 @@
import com.dsh.activity.entity.THuiminRecord;
import com.dsh.activity.entity.TPayHuimin;
import com.dsh.activity.entity.TStudent;
import com.dsh.activity.enums.HuiminCardPaymentTypeEnum;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -19,8 +20,10 @@
import com.dsh.activity.util.DateUtil;
import com.dsh.activity.util.PayMoneyUtil;
import com.dsh.activity.util.ResultUtil;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -50,31 +53,52 @@
        List<SalesDetailVO> records = salesDetailVOPage.getRecords();
        for (SalesDetailVO record : records) {
            List<THuiminRecord> list = huiminRecordService.list(new LambdaQueryWrapper<THuiminRecord>()
                    .eq(THuiminRecord::getAppUserId, record.getAppUserId())
                    .eq(THuiminRecord::getHuiminCardId, record.getCarId()));
                    .eq(THuiminRecord::getPayId, record.getId()));
            record.setUseTimes(list.size());
        }
        if (CollUtil.isNotEmpty(records)){
            List<Integer> appUserIdList = records.stream().map(SalesDetailVO::getAppUserId).collect(Collectors.toList());
            List<AppUser> appUserList = appUserClient.queryAppUserBatch(appUserIdList);
            Map<Integer, AppUser> appUserMap = appUserList.stream().collect(Collectors.toMap(AppUser::getId, appUser -> appUser));
            records.forEach(item->{
                AppUser appUser = appUserMap.get(item.getAppUserId());
                if (Objects.nonNull(appUser)){
                    item.setUserName(appUser.getName());
                    item.setPhone(appUser.getPhone());
        for (SalesDetailVO record : records) {
            AppUser appUser = appUserClient.queryAppUser(record.getAppUserId());
            if (Objects.nonNull(appUser)){
                record.setUserName(appUser.getName());
                record.setPhone(appUser.getPhone());
            }
            StringBuilder stringBuilder = new StringBuilder();
            String[] split = record.getStudentId().split(",");
            for (String s : split) {
                String replace = s.replace(" ", "");
                List<TStudent> studentById = studentClient.getStudentByIds(replace);
                if (!studentById.isEmpty()){
                    stringBuilder.append(studentById.get(0).getName()+",");
                }
                List<TStudent> studentList = studentClient.getStudentByIds(item.getStudentId());
                if (CollUtil.isNotEmpty(studentList)){
                    item.setStudentName(studentList.stream().map(TStudent::getName).collect(Collectors.joining(",")));
                }
            });
            }
            String string = stringBuilder.toString();
            if (StringUtils.hasLength(string)) {
                String stringWithoutLastCharacter = string.substring(0, string.length() - 1);
                record.setStudentName(stringWithoutLastCharacter);
            }
        }
//        if (CollUtil.isNotEmpty(records)){
//            List<Integer> appUserIdList = records.stream().map(SalesDetailVO::getAppUserId).collect(Collectors.toList());
//            List<AppUser> appUserList = appUserClient.queryAppUserBatch(appUserIdList);
//            Map<Integer, AppUser> appUserMap = appUserList.stream().collect(Collectors.toMap(AppUser::getId, appUser -> appUser));
//            records.forEach(item->{
//                AppUser appUser = appUserMap.get(item.getAppUserId());
//                if (Objects.nonNull(appUser)){
//                    item.setUserName(appUser.getName());
//                    item.setPhone(appUser.getPhone());
//                }
//                List<TStudent> studentList = studentClient.getStudentByIds(item.getStudentId());
//                if (CollUtil.isNotEmpty(studentList)){
//                    item.setStudentName(studentList.stream().map(TStudent::getName).collect(Collectors.joining(",")));
//                }
//            });
//        }
        return salesDetailVOPage;
    }

    @Override
    public Map<String, BigDecimal> getStaticsData(HuiminPayQuery query) {
        query.setGiftPaymentType(HuiminCardPaymentTypeEnum.GIFT.getCode());
        return baseMapper.getStaticsData(query);
    }

@@ -82,9 +106,12 @@
    public ResultUtil<?> refund(Integer id) throws AlipayApiException {
        TPayHuimin payHuimin = this.getById(id);
        if (Objects.nonNull(payHuimin)) {
            Integer count = huiminRecordService.lambdaQuery().eq(THuiminRecord::getAppUserId, payHuimin.getAppUserId())
                    .eq(THuiminRecord::getHuiminCardId, payHuimin.getCardId())
                    .lt(THuiminRecord::getInsertTime, DateUtil.addDay(payHuimin.getPaymentTime(),7))
            // 赠送订单不产生支付金额，禁止退款。
            if (HuiminCardPaymentTypeEnum.isGift(payHuimin.getPaymentType())){
                throw new IllegalArgumentException("赠送惠民卡不允许退款");
            }
            Integer count = huiminRecordService.lambdaQuery()
                    .eq(THuiminRecord::getPayId, payHuimin.getId())
                    .count();
            if (count > 0 || new Date().after(DateUtil.addDay(payHuimin.getPaymentTime(),7))) {
                //超过七日或者七日内有使用记录的退款：更改状态，实际退款线下操作。
@@ -92,7 +119,7 @@
            } else {
                if (payHuimin.getPaymentType() == 1) {
                    Map<String, String> map = payMoneyUtil.wxRefund(payHuimin.getOrderNumber(), payHuimin.getCode(),
                            payHuimin.getSalesMoney().toString(), payHuimin.getSalesMoney().toString(), "/base/worldCup/wxRefundWorldCupCallback");
                            payHuimin.getSalesMoney().toString(), payHuimin.getSalesMoney().toString(), "/base/huimin/callBack/wxRefundHuiminCallback");
                    if (!"SUCCESS".equals(map.get("return_code"))) {
                        System.err.println("-------------微信退款失败---------");
                        System.err.println(map.get("return_msg"));