2.0bug修改

无关风月

2024-09-06 de9d3974b9068ffc0893f62d33b50e3864603c80

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java

@@ -27,6 +27,7 @@
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.stream.Collectors;
@@ -478,10 +479,18 @@
            res.add(grantVO);
        }


        // 总额
        total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
        // 已使用司机奖励合计
        driver = driverConsume.add(driverWithdrawal1);
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        // 对集合进行排序
        res.sort((a, b) -> {
            LocalDateTime timeA = LocalDateTime.parse(a.getInsertTime(), formatter);
            LocalDateTime timeB = LocalDateTime.parse(b.getInsertTime(), formatter);
            return timeA.compareTo(timeB);
        });
        return res;
    }

@@ -882,7 +891,7 @@
        // 已使用司机奖励合计
        driver = driverConsume.add(driverWithdrawal1);
        UseMoneyVO useMoneyVO = new UseMoneyVO();
        useMoneyVO.setTotal(total);
        useMoneyVO.setTotal(total.add(driver));
        useMoneyVO.setDiscount(discount);
        useMoneyVO.setRedPackage(redPackage);
        useMoneyVO.setCoupon(coupon);
@@ -892,6 +901,8 @@
        return useMoneyVO;
    }

    @Autowired
    private ISysRedPacketRecordService sysRedPacketRecordService;
    /**
     * 发放补贴统计
     */
@@ -1006,6 +1017,7 @@
                    ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1029,6 +1041,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1136,6 +1149,11 @@
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
            }
            if (userRedPacketRecord.getIsGrant() == 1){
                // 后台发放的红包
                grantVO.setRemark("指定发放");
            }

            UserActivityRedenvelope userActivityRedenvelope =
                    userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
            if (userActivityRedenvelope!=null){
@@ -1309,6 +1327,7 @@
            ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
            ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1332,6 +1351,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()