修改bug

zhibing.pu

2024-08-27 80c2d96df6745cd0286b4d037f9e6049944486e5

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

@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

@@ -26,8 +27,10 @@
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;

/**
 * 控制器
@@ -204,11 +207,7 @@
        // 司机已消费金额
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                ;
        if (time == 5 && insertTime==null){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    ;
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
@@ -237,11 +236,13 @@
            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    ;
            ;
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);
            // 专车wrapper
@@ -276,7 +277,7 @@
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .between("createTime", start, end);
            // 司机提现


        }
        // 司机提现wrapper
@@ -478,12 +479,21 @@
            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;
    }

    @RequestMapping(value = "/use/getCount")
    @ResponseBody
    public Object getCount1(Integer time,String insertTime,Integer type) {
@@ -585,13 +595,13 @@
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                ;
        // 司机提现
        Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
        Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
            ;
                    .eq("type",1)
                    .eq("userType", 2);
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
@@ -621,6 +631,7 @@
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);
            // 专车wrapper
@@ -673,6 +684,7 @@
                    // 司机消费记录
                    balanceUsageRecords = balanceUsageRecordService.selectList(between4);

                    // 司机提现记录
                    driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
                    break;
                case 4:
@@ -696,7 +708,7 @@
            // 消费
            balanceUsageRecords = balanceUsageRecordService.selectList(between4);
            // 提现
            driverWithdrawal = pubWithdrawalService.selectList(between44);
            driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
        }

        // 已发放补贴总额
@@ -767,7 +779,7 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
            redPackage = redPackage.add(new BigDecimal(temp.toString()));
        }
        for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
@@ -789,7 +801,7 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
            redPackage = redPackage.add(new BigDecimal(temp.toString()));
        }
        // 查询已领取优惠券总额
        for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
@@ -805,7 +817,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            res.add(grantVO);
        }
        for (TOrderLogistics userCouponRecord : userCouponRecords1) {
@@ -821,7 +833,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            res.add(grantVO);
        }
        // 司机消费奖励
@@ -879,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);
@@ -889,6 +901,8 @@
        return useMoneyVO;
    }

    @Autowired
    private ISysRedPacketRecordService sysRedPacketRecordService;
    /**
     * 发放补贴统计
     */
@@ -985,7 +999,7 @@
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")
@@ -1003,6 +1017,7 @@
                    ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1026,6 +1041,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1133,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){
@@ -1154,10 +1175,9 @@
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
            }
            SysCouponRecord sysCouponRecord =
                    sysCouponRecordService.selectById(userCouponRecord.getCouponId());
            if (sysCouponRecord!=null){
                grantVO.setRemark(sysCouponRecord.getName());
            SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(userCouponRecord.getCouponActivityId());
            if (sysCouponActivity!=null){
                grantVO.setRemark(sysCouponActivity.getName());
            }
            coupon = coupon.add(new BigDecimal(userCouponRecord.getMoney().toString()));
            res.add(grantVO);
@@ -1190,8 +1210,11 @@
            driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
            res.add(grantVO);
        }
        List<GrantVO> sortedList = res.stream()
                .sorted((o1, o2) -> o2.getInsertTime().compareTo(o1.getInsertTime()))
                .collect(Collectors.toList());
        total = total.add(redPackage).add(coupon).add(discount).add(driver);
        return res;
        return sortedList;
    }
    @RequestMapping(value = "/grant/getCount")
    @ResponseBody
@@ -1286,7 +1309,7 @@
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")
@@ -1304,6 +1327,7 @@
            ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
            ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1327,6 +1351,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()