修改bug

Pu Zhibing

2024-11-09 f85ea638d98b302c590e65f00e6912d91601613c

 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,44 +207,59 @@
        // 司机已消费金额
        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")
                    .isNotNull("discountMoney");
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);

            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);

            // 已使用优惠券记录wrapper
           between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
                    .isNotNull("couponMoney")
                   .between("insertTime", start, end);

            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);

            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);

            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);

            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6);
                    .eq("type",1)
                    .ne("purpose", 6)
                    .between("insertTime", start, end);

            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    ;
                    .between("insertTime", start, end);

            ;
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);
            // 专车wrapper
@@ -275,8 +293,9 @@
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .eq("type",1)
                    .between("createTime", start, end);
            // 司机提现


        }
        // 司机提现wrapper
@@ -367,13 +386,13 @@
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
            for (int i = 0; i < objects.size(); i++) {
                String string = objects.getJSONObject(i).getString("money");
                temp = temp.add(new BigDecimal(string));
            if (userRedPacketRecord.getRedPacketMoney()==null){
                continue;
            }
            grantVO.setAmount(temp.toString());
            if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
                continue;
            }
            grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -386,13 +405,13 @@
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
            for (int i = 0; i < objects.size(); i++) {
                String string = objects.getJSONObject(i).getString("money");
                temp = temp.add(new BigDecimal(string));
            if (userRedPacketRecord.getRedPacketMoney()==null){
                continue;
            }
            grantVO.setAmount(temp.toString());
            if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
                continue;
            }
            grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -478,12 +497,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) {
@@ -563,6 +591,7 @@
        List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
        // 司机提现
        List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();

        Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
                ;
        // 专车wrapper
@@ -584,43 +613,59 @@
        // 司机已消费金额
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                ;
        // 司机提现
        Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
                ;
        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")
                    .isNotNull("discountMoney");
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);

            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);

            // 已使用优惠券记录wrapper
            between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);

            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);

            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);

            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);

            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6);
                    .eq("type",1)
                    .ne("purpose", 6)
                    .between("insertTime", start, end);

            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);

            ;
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);
            // 专车wrapper
@@ -654,9 +699,12 @@
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .eq("type",1)
                    .between("createTime", start, end);
        }


        }
        // 司机提现wrapper
        if (type!=null){
            switch (type){
                case 1:
@@ -672,7 +720,6 @@
                case 3:
                    // 司机消费记录
                    balanceUsageRecords = balanceUsageRecordService.selectList(between4);

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

        // 已发放补贴总额
@@ -715,9 +762,6 @@
        BigDecimal driverWithdrawal1 = new BigDecimal("0");
        // 查询已使用折扣总额
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
                continue;
            }
            discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -731,9 +775,6 @@
            res.add(grantVO);
        }
        for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
                continue;
            }
            discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -746,43 +787,43 @@
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
            res.add(grantVO);
        }
        // 查询已领取红包总额
        // 查询已使用红包总额
        for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
            for (int i = 0; i < objects.size(); i++) {
                String string = objects.getJSONObject(i).getString("money");
                temp = temp.add(new BigDecimal(string));
//            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
//            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
//            for (int i = 0; i < objects.size(); i++) {
//                String string = objects.getJSONObject(i).getString("money");
//                temp = temp.add(new BigDecimal(string));
//            }
            if (userRedPacketRecord.getRedPacketMoney()==null){
                continue;
            }
            grantVO.setAmount(temp.toString());
            if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
                continue;
            }
            grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
            redPackage = redPackage.add(userRedPacketRecord.getRedPacketMoney());
        }
        for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
            for (int i = 0; i < objects.size(); i++) {
                String string = objects.getJSONObject(i).getString("money");
                temp = temp.add(new BigDecimal(string));
            if (userRedPacketRecord.getRedPacketMoney()==null){
                continue;
            }
            grantVO.setAmount(temp.toString());
            if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){
                continue;
            }
            grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -793,9 +834,6 @@
        }
        // 查询已领取优惠券总额
        for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
            if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
            grantVO.setType("优惠券");
@@ -809,9 +847,6 @@
            res.add(grantVO);
        }
        for (TOrderLogistics userCouponRecord : userCouponRecords1) {
            if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
            grantVO.setType("优惠券");
@@ -826,7 +861,6 @@
        }
        // 司机消费奖励
        for (BalanceUsageRecord balanceUsageRecord : balanceUsageRecords) {

            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
            grantVO.setType("司机奖励");
@@ -874,6 +908,8 @@
            driverWithdrawal1 = driverWithdrawal1.add(new BigDecimal(balanceUsageRecord.getMoney().toString()));
            res.add(grantVO);
        }


        // 总额
        total = total.add(redPackage).add(coupon).add(discount).add(driverConsume).add(driverWithdrawal1);
        // 已使用司机奖励合计
@@ -889,6 +925,8 @@
        return useMoneyVO;
    }

    @Autowired
    private ISysRedPacketRecordService sysRedPacketRecordService;
    /**
     * 发放补贴统计
     */
@@ -985,7 +1023,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 +1041,7 @@
                    ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1026,6 +1065,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1133,6 +1173,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 +1199,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 +1234,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 +1333,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 +1351,7 @@
            ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
            ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1327,6 +1375,7 @@
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .ne("state",0)
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()