2.0bug修改

无关风月

2024-07-22 0eb94b78e462484bfe92a5c5967eaa0ac0d83fd5

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

@@ -27,6 +27,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 控制器
@@ -109,7 +110,7 @@
    @ResponseBody
    public Object getCount(Integer time,String insertTime,Integer state) {
        if (time == null){
            time = 1;
            time =1;
        }
        String beginTime = null;
        String endTime = null;
@@ -168,46 +169,51 @@
        }
        List<Income> incomes = new ArrayList<>();
        List<SettlementDetail> settlementDetails = new ArrayList<>();
        if (state!=null){
            switch (state){
                case 1:
                    // 已结算
                    // 查询已结算的
                    incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                            .eq("userType", 2)
                            .ne("type", 1)
                            .isNotNull("orderType")
                            .between("insertTime", start, end));


                    break;
                case 2:
                    // 未结算

                    break;
            }
        }else{
        if (time == null){
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 2)
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));
                    .isNotNull("orderType"));
        }else{
            if (time == 5){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .isNotNull("orderType"));
            }else{
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .isNotNull("orderType")
                        .between("insertTime", start, end));
            }

        }


        List<PlatformVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        // 已结算金额
        BigDecimal balance = new BigDecimal("0");
        // 未结算金额
        BigDecimal unBalance = new BigDecimal("0");
        // 查询所有已结算的订单
        // 查询订单是否已结算

        // 专车订单结算明细
        List<SettlementDetail> privateCar = settlementDetails.stream().filter(t -> t.getOrderType() == 1).collect(Collectors.toList());
        // 小件物流结算明细
        List<SettlementDetail> xjwl = settlementDetails.stream().filter(t -> t.getOrderType() == 4).collect(Collectors.toList());

        // 查询已结算的订单
        for (Income income : incomes) {
            PlatformVO platformVO = new PlatformVO();
            platformVO.setState(1);
            switch (income.getOrderType()){
                case 1:
                    if (state!=null && state==2){
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    if (tOrderPrivateCar==null){
@@ -219,7 +225,6 @@
                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setDriverPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());
                    if (income.getInsertTime()!=null){
                        platformVO.setEndTime(format.format(income.getInsertTime()));
@@ -245,11 +250,15 @@
                            platformVO.setPayType("现金支付");
                            break;
                    }

                    // 专车订单
                    balance = balance.add(new BigDecimal(income.getMoney()));
                    res.add(platformVO);
                    break;
                case 4:
                    if (state!=null && state==2){
                        continue;
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
@@ -286,16 +295,20 @@
                            platformVO.setPayType("现金支付");
                            break;
                    }

                    // 专车订单
                    balance = balance.add(new BigDecimal(income.getMoney()));
                    res.add(platformVO);
                    break;
            }
        }

        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        settlementDetailEntityWrapper.between("createTime", start, end);
        if (time!=null && time!=5 ){
            settlementDetailEntityWrapper.between("createTime", start, end);
        }
        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
        // 查询所有现金支付的订单
        // 查询所有现金支付的订单 再根据结算主表判断是否已结算
        for (SettlementDetail settlementDetail : settlementDetails) {
            PlatformVO platformVO = new PlatformVO();
            switch (settlementDetail.getOrderType()){
@@ -311,43 +324,30 @@
                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setDriverPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());

                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    String string = settlementDetail.getPrice().toString();
                    BigDecimal bigDecimal1 = new BigDecimal(string);
                    platformVO.setMoney(bigDecimal1);
                    platformVO.setPayType("现金支付");

                    // 查询是否结算
                    SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 1){
                                continue;
                            }
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord!=null && settlementRecord.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        if (settlementRecord.getDay()!=null){
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }

                    res.add(platformVO);
                    break;
                case 4:
@@ -369,30 +369,19 @@
                    platformVO.setMoney(bigDecimal2);
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    platformVO.setPayType("现金支付");
                    // 查询是否结算
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 1){
                                continue;
                            }
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        if (settlementRecord1.getDay()!=null){
                            platformVO.setEndTime(format.format(settlementRecord1.getDay()));
                        }
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
@@ -481,90 +470,123 @@
                    break;
            }
        }
        List<Income> incomes = new ArrayList<>();
        List<SettlementDetail> settlementDetails = new ArrayList<>();
        // 用户订单记录
        List<TPubTransactionDetails> tOrderPrivateCars = new ArrayList<>();
        // 用户小件物流订单记录
        List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
        List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
        // 用户充值
        List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
        // 司机结算总额
       List<SettlementDetail> settlementDetails1 = new ArrayList<>();
        // 司机提现
        List<TPubWithdrawal> driver = new ArrayList<>();
        // 用户提现
        List<TPubWithdrawal> user = new ArrayList<>();
        // 余额充值wrapper
        Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>()
                .eq("orderType", 5)
                .between("insertTime",start,end);
        Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>();
        // 用户提现wrapper
        Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 1)
                .between("handleTime", start, end);
        Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>();
        // 司机提现wrapper
        Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 2)
                .between("handleTime", start, end);
        // 用户订单wrapper
//        Wrapper<PaymentRecord> between1 = new EntityWrapper<PaymentRecord>()
//                .eq("type", 1)
//                .eq("category", 1)
//                .ne("orderType", 3)
//                .ne("orderType", 5)
//                .ne("orderType", 6)
//                .between("insertTime", start, end);
        // 用户订单wrapper
        Wrapper<TPubTransactionDetails> between1 = new EntityWrapper<TPubTransactionDetails>()
                .in("orderType", Arrays.asList(1, 4))
                .between("insertTime", start, end);
        Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>();
        // 用户专车订单wrapper
        EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
        // 用户小件物流订单wrapper
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time!=null && time == 5){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
                    .eq("orderType", 5)
                    ;
            // 用户提现wrapper
            userWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 1)
                  ;
            // 司机提现wrapper
            between = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2);
            // 用户专车订单wrapper
            tOrderPrivateCarEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
            // 用户小件物流订单wrapper
            tOrderLogisticsEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
            // 司机手动结算金额
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .in("orderType", Arrays.asList(1, 4));
        }else{
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("orderType", 5)
                    .eq("userType",1)
                    .between("insertTime",start,end);
            // 用户提现wrapper
            userWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 1)
                    .between("handleTime", start, end);
            // 司机提现wrapper
            between = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    .between("handleTime", start, end);
            // 司机手动结算金额
           orderType1 = new EntityWrapper<SettlementDetail>()
                    .in("orderType", Arrays.asList(1, 4))
                    .between("createTime", start, end);
            // 用户专车订单wrapper
            tOrderPrivateCarEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
            // 用户小件物流订单wrapper
            tOrderLogisticsEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
        }


        if (type != null){
            switch (type){
                case 1:
                    // 只查询用户订单
                    tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
                     tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);

                    break;
                case 2:
                    // 只查询用户充值
                    tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
                    break;
                case 3:
                    // 只查询司机已结算的
                    incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                            .eq("userType", 2)
                            .ne("type", 1)
                            .isNotNull("orderType")
                            .between("insertTime", start, end));

                    // 只查询司机手动结算的
                    settlementDetails1 = settlementDetailService.selectList(orderType1);
                    break;
                case 4:
                    if(payType!=null && payType == 2){
                        break;
                    }
                    driver = pubWithdrawalService.selectList(between);
                    // 只查询司机提现
                    break;
                case 5:
                    if(payType!=null && payType == 2){
                        break;
                    }
                    // 只查询用户提现
                    user = pubWithdrawalService.selectList(userWrapper);
                    break;
            }
        }else{
            tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
            // 只查询用户订单
            tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
            tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
            tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 2)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));
            // 只查询司机手动结算的
            settlementDetails1 = settlementDetailService.selectList(orderType1);
            driver = pubWithdrawalService.selectList(between);
            user = pubWithdrawalService.selectList(userWrapper);
        }
        List<WaterVO> res = new ArrayList<>();
//        List<PlatformVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        // 司机结算金额
        BigDecimal balance = new BigDecimal("0");
@@ -577,118 +599,82 @@
        // 用户提现金额
        BigDecimal userWithdrawal = new BigDecimal("0");
        // 用户订单消费
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (payType!=null){
                if (tOrderPrivateCar.getPayType()!=payType){
                    continue;
                }
            }

        for (TPubTransactionDetails tOrderPrivateCar : tOrderPrivateCars) {
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
            waterVO.setType("用户订单消费");
            switch (tOrderPrivateCar.getOrderType()){
            switch (tOrderPrivateCar.getPayType()){
                case 1:
                    // 专车
                    TOrderPrivateCar tOrderPrivateCar1 = orderPrivateCarService.selectById(tOrderPrivateCar.getOrderId());
                    if (tOrderPrivateCar1 != null){
                        waterVO.setCode(tOrderPrivateCar1.getOrderNum());
                        String string = tOrderPrivateCar.getMoney().toString();
                        waterVO.setMoney(new BigDecimal(string));
                    }else{
                        waterVO.setMoney(new BigDecimal("0"));
                    }
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
                        waterVO.setPhone(user1.getPhone());
                    }

                    if (tOrderPrivateCar1 != null){
                        if (tOrderPrivateCar1.getPayType()!=null){
                            switch (tOrderPrivateCar1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("银行卡支付");
                                    break;
                                case 3:

                                case 4:
                                    continue;
                            }
                        }else{
                            continue;
                        }
                    }else{
                        continue;
                    }
                    if (tOrderPrivateCar1 != null){
                        waterVO.setRemark(tOrderPrivateCar1.getRemark());
                    }
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
                    waterVO.setPayType("手机支付");
                    break;
                case 4:
                    // 小件物流
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tOrderPrivateCar.getOrderId());
                    if (tOrderLogistics != null){
                        waterVO.setCode(tOrderLogistics.getOrderNum());
                        String string = tOrderPrivateCar.getMoney().toString();
                        waterVO.setMoney(new BigDecimal(string));
                    }else{
                        waterVO.setMoney(new BigDecimal("0"));
                    }
                    TUser user2 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user2!=null){
                        waterVO.setName(user2.getNickName());
                        waterVO.setPhone(user2.getPhone());
                    }
                    waterVO.setType("用户订单消费");
                    if (tOrderLogistics != null){
                        if (tOrderLogistics.getPayType()!=null){
                            switch (tOrderLogistics.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("银行卡支付");
                                    break;
                                case 3:

                                case 4:
                                    continue;
                            }
                        }else{
                            continue;
                        }
                    }else{
                        continue;
                    }
                    if (tOrderLogistics != null){
                        waterVO.setRemark(tOrderLogistics.getRemark());
                    }
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
                case 2:
                    waterVO.setPayType("银行卡支付");
                    break;
            }
            // 专车
            if (tOrderPrivateCar != null){
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
            }else{
                waterVO.setMoney(new BigDecimal("0"));
            }
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
                waterVO.setPhone(user1.getPhone());
            }

            if (tOrderPrivateCar != null){
                waterVO.setRemark(tOrderPrivateCar.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
        }
        for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
            if (payType!=null){
                if (tOrderLogistic.getPayType()!=payType){
                    continue;
                }
            }
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
            waterVO.setType("用户订单消费");
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
                waterVO.setPhone(user2.getPhone());
            }
            waterVO.setType("用户订单消费");
            switch (tOrderLogistic.getPayType()){
                case 1:
                    waterVO.setPayType("手机支付");
                    break;
                case 2:
                    waterVO.setPayType("银行卡支付");
                    break;
            }
            if (tOrderLogistics != null){
                waterVO.setRemark(tOrderLogistic.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            break;
        }



        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 2){
@@ -777,13 +763,42 @@
            userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
        }
        // 查询所有已结算的订单
        for (Income income : incomes) {
        for (SettlementDetail income : settlementDetails1) {
            WaterVO platformVO = new WaterVO();
            platformVO.setType("司机结算");
            switch (income.getOrderType()){
                case 1:
                    SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord!=null){
                        if (settlementRecord.getPayType()!=null){
                            switch (settlementRecord.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                case 4:
                                    continue;
                            }

                        }
                    }else{
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -793,14 +808,13 @@
                        platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());
                    if (income.getInsertTime()!=null){
                        platformVO.setInsertTime(format.format(income.getInsertTime()));
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    if (tOrderPrivateCar.getOrderMoney() != null){
                        String string = tOrderPrivateCar.getOrderMoney().toString();
                    if (income.getOrderMoney() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                    }else{
@@ -810,179 +824,70 @@
                    if (tOrderPrivateCar.getPayType() == null){
                        continue;
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            if (payType!=null){
                                if (payType != 1){
                                    continue;
                                }
                            }
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            if (payType!=null){
                                if (payType != 2){
                                    continue;
                                }
                            }
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                        case 4:
                            continue;
                    }


                    // 专车订单
                    String string4 = tOrderPrivateCar.getOrderMoney().toString();
                    String string4 = income.getPrice().toString();
                    balance = balance.add(new BigDecimal(string4));
                    res.add(platformVO);
                    break;
                case 4:
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord1==null){
                        if (settlementRecord1.getPayType()!=null){
                            switch (settlementRecord1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                case 4:
                                    continue;
                            }

                        }
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
                    if (tOrderLogistics==null){
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
                    if (tOrderLogistics1==null){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics.getOrderNum());
                    TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
                    platformVO.setCode(tOrderLogistics1.getOrderNum());
                    TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
                    if (tDriver1!=null){
                        platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
                        platformVO.setPhone(tDriver1.getPhone());
                    }

                    platformVO.setRemark(tOrderLogistics.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    if (income.getInsertTime()!=null){
                        platformVO.setInsertTime(format.format(income.getInsertTime()));
                    platformVO.setRemark(tOrderLogistics1.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getPrice()));
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    if (tOrderLogistics.getPayType() == null){
                    platformVO.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
                    if (tOrderLogistics1.getPayType() == null){
                        continue;
                    }
                    switch (tOrderLogistics.getPayType()){
                        case 1:
                            if (payType!=null){
                                if (payType != 1){
                                    continue;
                                }
                            }
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            if (payType!=null){
                                if (payType != 2){
                                    continue;
                                }
                            }
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:

                        case 4:
                            continue;
                    }
                    String string1 = tOrderLogistics.getOrderMoney().toString();
                    String string1 = income.getPrice().toString();
                    // 小件物流订单
                    balance = balance.add(new BigDecimal(string1));
                    res.add(platformVO);
                    break;
            }
        }
//        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
//        settlementDetailEntityWrapper.between("createTime", start, end);
//        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
//        // 查询所有现金支付的订单
//        for (SettlementDetail settlementDetail : settlementDetails) {
//            WaterVO platformVO = new WaterVO();
//            switch (settlementDetail.getOrderType()){
//                case 1:
//                    // 专车订单
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
//                    if (tOrderPrivateCar==null){
//                        continue;
//                    }
//                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
//                    TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
//                    if (tDriver!=null){
//                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
//                        platformVO.setDriverPhone(tDriver.getPhone());
//                    }
//                    platformVO.setRemark(tOrderPrivateCar.getRemark());
//                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
//                    String string = settlementDetail.getPrice().toString();
//                    BigDecimal bigDecimal1 = new BigDecimal(string);
//                    platformVO.setMoney(bigDecimal1);
//                    platformVO.setPayType("现金支付");
//                    // 查询是否结算
//                    SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
//
//                    if (settlementRecord.getPaymentStatus() == 1){
//                        continue;
//                    }
//
//                    // 已结算
//                    platformVO.setState(1);
//                    balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
//                    if (settlementRecord.getDay()!=null){
//                        platformVO.setInsertTime(format.format(settlementRecord.getDay()));
//                    }
//
//                    res.add(platformVO);
//                    break;
//                case 4:
//                    // 小件物流
//                    // 查询订单信息
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
//                    if (tOrderLogistics==null){
//                        continue;
//                    }
//                    platformVO.setCode(tOrderLogistics.getOrderNum());
//                    TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
//                    if (tDriver1!=null){
//                        platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
//                        platformVO.setDriverPhone(tDriver1.getPhone());
//                    }
//                    platformVO.setRemark(tOrderLogistics.getRemark());
//                    String string1 = settlementDetail.getPrice().toString();
//                    BigDecimal bigDecimal2 = new BigDecimal(string1);
//                    platformVO.setMoney(bigDecimal2);
//                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
//                    platformVO.setPayType("现金支付");
//                    // 查询是否结算
//                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
//                    if (payType!=null){
//                        if (payType == 1){
//                            // 查询已结算的
//                            if (settlementRecord1.getPaymentStatus() == 1){
//                                continue;
//                            }
//                        }
//                        if (payType == 2){
//                            // 查询未结算的
//                            if (settlementRecord1.getPaymentStatus() == 2){
//                                continue;
//                            }
//                        }
//                    }
//                    if (settlementRecord1.getPaymentStatus() == 2){
//                        // 已结算
//                        platformVO.setState(1);
//                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
//                        if (settlementRecord1.getDay()!=null){
//                            platformVO.setInsertTime(format.format(settlementRecord1.getDay()));
//                        }
//                    }else{
//                        // 未结算
//                        platformVO.setState(2);
//                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
//                    }
//                    res.add(platformVO);
//                    break;
//            }
//        }
        // 计算佣金总额
//        BigDecimal add = unBalance.add(balance);
        Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
        WaterMoneyVO waterMoneyVO = new WaterMoneyVO();
        BigDecimal add = userRecharge.add(userConsume).add(balance).subtract(driverWithdrawal).subtract(userWithdrawal);
@@ -1067,90 +972,125 @@
                    break;
            }
        }
        List<Income> incomes = new ArrayList<>();
        List<SettlementDetail> settlementDetails = new ArrayList<>();
        // 用户订单记录
        List<TPubTransactionDetails> tOrderPrivateCars = new ArrayList<>();
        // 用户小件物流订单记录
        List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
        List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
        // 用户充值
        List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
        // 司机结算总额
        List<SettlementDetail> settlementDetails1 = new ArrayList<>();
        // 司机提现
        List<TPubWithdrawal> driver = new ArrayList<>();
        // 用户提现
        List<TPubWithdrawal> user = new ArrayList<>();
        // 余额充值wrapper
        Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>()
                .eq("orderType", 5)
                .between("insertTime",start,end);
        Wrapper<TPubTransactionDetails> orderType = new EntityWrapper<TPubTransactionDetails>();
        // 用户提现wrapper
        Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 1)
                .between("handleTime", start, end);
        Wrapper<TPubWithdrawal> userWrapper = new EntityWrapper<TPubWithdrawal>();
        // 司机提现wrapper
        Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 2)
                .between("handleTime", start, end);
        // 用户订单wrapper
//        Wrapper<PaymentRecord> between1 = new EntityWrapper<PaymentRecord>()
//                .eq("type", 1)
//                .eq("category", 1)
//                .ne("orderType", 3)
//                .ne("orderType", 5)
//                .ne("orderType", 6)
//                .between("insertTime", start, end);
        // 用户订单wrapper
        Wrapper<TPubTransactionDetails> between1 = new EntityWrapper<TPubTransactionDetails>()
                .eq("userType",1)
                .in("orderType", Arrays.asList(1, 4))
                .between("insertTime", start, end);
        Wrapper<TPubWithdrawal> between = new EntityWrapper<TPubWithdrawal>();
        // 用户专车订单wrapper
        EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
        // 用户小件物流订单wrapper
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time!=null && time == 5){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
                    .eq("orderType", 5)
            ;
            // 用户提现wrapper
            userWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 1)
            ;
            // 司机提现wrapper
            between = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2);
            // 用户专车订单wrapper
            tOrderPrivateCarEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
            // 用户小件物流订单wrapper
            tOrderLogisticsEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
            // 司机手动结算金额
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4));
        }else{
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("orderType", 5)
                    .eq("userType",1)
                    .between("insertTime",start,end);
            // 用户提现wrapper
            userWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 1)
                    .between("handleTime", start, end);
            // 司机提现wrapper
            between = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    .between("handleTime", start, end);
            // 司机手动结算金额
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4))
                    .between("createTime", start, end);
            // 用户专车订单wrapper
            tOrderPrivateCarEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
            // 用户小件物流订单wrapper
            tOrderLogisticsEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
        }


        if (type != null){
            switch (type){
                case 1:
                    // 只查询用户订单
                    tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
                    tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);

                    break;
                case 2:
                    // 只查询用户充值
                    tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
                    break;
                case 3:
                    // 只查询司机已结算的
                    incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                            .eq("userType", 2)
                            .ne("type", 1)
                            .isNotNull("orderType")
                            .between("insertTime", start, end));
                    // 只查询司机手动结算的
                    settlementDetails1 = settlementDetailService.selectList(orderType1);
                    break;
                case 4:
                    if(payType!=null && payType == 2){
                        break;
                    }
                    driver = pubWithdrawalService.selectList(between);
                    // 只查询司机提现
                    break;
                case 5:
                    if(payType!=null && payType == 2){
                        break;
                    }
                    // 只查询用户提现
                    user = pubWithdrawalService.selectList(userWrapper);
                    break;
            }
        }else{
            tOrderPrivateCars = pubTransactionDetailsService.selectList(between1);
            // 只查询用户订单
            tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
            tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
            tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 2)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));
            // 只查询司机手动结算的
            settlementDetails1 = settlementDetailService.selectList(orderType1);
            driver = pubWithdrawalService.selectList(between);
            user = pubWithdrawalService.selectList(userWrapper);
        }
        List<WaterVO> res = new ArrayList<>();
//        List<PlatformVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        // 司机结算金额
        BigDecimal balance = new BigDecimal("0");
@@ -1164,116 +1104,78 @@
        BigDecimal userWithdrawal = new BigDecimal("0");
        // 用户订单消费

        for (TPubTransactionDetails tOrderPrivateCar : tOrderPrivateCars) {
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (payType!=null){
                if (tOrderPrivateCar.getPayType()!=payType){
                    continue;
                }
            }

            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
            waterVO.setType("用户订单消费");
            switch (tOrderPrivateCar.getOrderType()){
            switch (tOrderPrivateCar.getPayType()){
                case 1:
                    // 专车
                    TOrderPrivateCar tOrderPrivateCar1 = orderPrivateCarService.selectById(tOrderPrivateCar.getOrderId());
                    if (tOrderPrivateCar1 != null){
                        waterVO.setCode(tOrderPrivateCar1.getOrderNum());
                        String string = tOrderPrivateCar.getMoney().toString();
                        waterVO.setMoney(new BigDecimal(string));
                    }else{
                        waterVO.setMoney(new BigDecimal("0"));
                    }
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
                        waterVO.setPhone(user1.getPhone());
                    }

                    if (tOrderPrivateCar1 != null){
                        if (tOrderPrivateCar1.getPayType()!=null){
                            switch (tOrderPrivateCar1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("银行卡支付");
                                    break;
                                case 3:

                                case 4:
                                    continue;
                            }
                        }else{
                            continue;
                        }
                    }else{
                        continue;
                    }
                    if (tOrderPrivateCar1 != null){
                        waterVO.setRemark(tOrderPrivateCar1.getRemark());
                    }
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
                    waterVO.setPayType("手机支付");
                    break;
                case 4:
                    // 小件物流
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tOrderPrivateCar.getOrderId());
                    if (tOrderLogistics != null){
                        waterVO.setCode(tOrderLogistics.getOrderNum());
                        String string = tOrderPrivateCar.getMoney().toString();
                        waterVO.setMoney(new BigDecimal(string));
                    }else{
                        waterVO.setMoney(new BigDecimal("0"));
                    }
                    TUser user2 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user2!=null){
                        waterVO.setName(user2.getNickName());
                        waterVO.setPhone(user2.getPhone());
                    }
                    waterVO.setType("用户订单消费");
                    if (tOrderLogistics != null){
                        if (tOrderLogistics.getPayType()!=null){
                            switch (tOrderLogistics.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
                                    waterVO.setPayType("银行卡支付");
                                    break;
                                case 3:

                                case 4:
                                    continue;
                            }
                        }else{
                            continue;
                        }
                    }else{
                        continue;
                    }
                    if (tOrderLogistics != null){
                        waterVO.setRemark(tOrderLogistics.getRemark());
                    }
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getMoney().toString()));
                case 2:
                    waterVO.setPayType("银行卡支付");
                    break;
            }
            // 专车
            if (tOrderPrivateCar != null){
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
            }else{
                waterVO.setMoney(new BigDecimal("0"));
            }
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
                waterVO.setPhone(user1.getPhone());
            }

            if (tOrderPrivateCar != null){
                waterVO.setRemark(tOrderPrivateCar.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
        }
        for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
            if (payType!=null){
                if (tOrderLogistic.getPayType()!=payType){
                    continue;
                }
            }
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderLogistic.getInsertTime()));
            waterVO.setType("用户订单消费");
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
                waterVO.setPhone(user2.getPhone());
            }
            waterVO.setType("用户订单消费");
            switch (tOrderLogistic.getPayType()){
                case 1:
                    waterVO.setPayType("手机支付");
                    break;
                case 2:
                    waterVO.setPayType("银行卡支付");
                    break;
            }
            if (tOrderLogistics != null){
                waterVO.setRemark(tOrderLogistic.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            break;
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
@@ -1340,8 +1242,12 @@
                                    continue;
                                }
                            }

                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                        case 4:
                            continue;
                    }
                }

@@ -1363,13 +1269,43 @@
            userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
        }
        // 查询所有已结算的订单
        for (Income income : incomes) {
        // 查询所有已结算的订单
        for (SettlementDetail income : settlementDetails1) {
            WaterVO platformVO = new WaterVO();
            platformVO.setType("司机结算");
            switch (income.getOrderType()){
                case 1:
                    SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord!=null){
                        if (settlementRecord.getPayType()!=null){
                            switch (settlementRecord.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                case 4:
                                    continue;
                            }

                        }
                    }else{
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -1379,14 +1315,13 @@
                        platformVO.setName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());
                    if (income.getInsertTime()!=null){
                        platformVO.setInsertTime(format.format(income.getInsertTime()));
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    if (tOrderPrivateCar.getOrderMoney() != null){
                        String string = tOrderPrivateCar.getOrderMoney().toString();
                    if (income.getPrice() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                    }else{
@@ -1395,27 +1330,6 @@

                    if (tOrderPrivateCar.getPayType() == null){
                        continue;
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            if (payType!=null){
                                if (payType != 1){
                                    continue;
                                }
                            }
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            if (payType!=null){
                                if (payType != 2){
                                    continue;
                                }
                            }
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                        case 4:
                            continue;
                    }

                    // 专车订单
@@ -1426,27 +1340,38 @@
                case 4:
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
                    if (tOrderLogistics==null){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics.getOrderNum());
                    TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
                    if (tDriver1!=null){
                        platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
                        platformVO.setPhone(tDriver1.getPhone());
                    }
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord1==null){
                        if (settlementRecord1.getPayType()!=null){
                            switch (settlementRecord1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                            continue;
                                        }
                                    }
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                case 4:
                                    continue;
                            }

                    platformVO.setRemark(tOrderLogistics.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    if (income.getInsertTime()!=null){
                        platformVO.setInsertTime(format.format(income.getInsertTime()));
                        }
                    }
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    if (tOrderLogistics.getPayType() == null){
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
                    if (tOrderLogistics1==null){
                        continue;
                    }
                    switch (tOrderLogistics.getPayType()){
                    switch (tOrderLogistics1.getPayType()){
                        case 1:
                            if (payType!=null){
                                if (payType != 1){
@@ -1468,105 +1393,30 @@
                        case 4:
                            continue;
                    }
                    String string1 = tOrderLogistics.getOrderMoney().toString();
                    platformVO.setCode(tOrderLogistics1.getOrderNum());
                    TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
                    if (tDriver1!=null){
                        platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
                        platformVO.setPhone(tDriver1.getPhone());
                    }

                    platformVO.setRemark(tOrderLogistics1.getRemark());
                    platformVO.setMoney(BigDecimal.valueOf(income.getPrice()));
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
                    if (tOrderLogistics1.getPayType() == null){
                        continue;
                    }

                    String string1 = tOrderLogistics1.getOrderMoney().toString();
                    // 小件物流订单
                    balance = balance.add(new BigDecimal(string1));
                    res.add(platformVO);
                    break;
            }
        }
//        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
//        settlementDetailEntityWrapper.between("createTime", start, end);
//        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
//        // 查询所有现金支付的订单
//        for (SettlementDetail settlementDetail : settlementDetails) {
//            WaterVO platformVO = new WaterVO();
//            switch (settlementDetail.getOrderType()){
//                case 1:
//                    // 专车订单
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
//                    if (tOrderPrivateCar==null){
//                        continue;
//                    }
//                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
//                    TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
//                    if (tDriver!=null){
//                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
//                        platformVO.setDriverPhone(tDriver.getPhone());
//                    }
//                    platformVO.setRemark(tOrderPrivateCar.getRemark());
//                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
//                    String string = settlementDetail.getPrice().toString();
//                    BigDecimal bigDecimal1 = new BigDecimal(string);
//                    platformVO.setMoney(bigDecimal1);
//                    platformVO.setPayType("现金支付");
//                    // 查询是否结算
//                    SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
//
//                    if (settlementRecord.getPaymentStatus() == 1){
//                        continue;
//                    }
//
//                    // 已结算
//                    platformVO.setState(1);
//                    balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
//                    if (settlementRecord.getDay()!=null){
//                        platformVO.setInsertTime(format.format(settlementRecord.getDay()));
//                    }
//
//                    res.add(platformVO);
//                    break;
//                case 4:
//                    // 小件物流
//                    // 查询订单信息
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
//                    if (tOrderLogistics==null){
//                        continue;
//                    }
//                    platformVO.setCode(tOrderLogistics.getOrderNum());
//                    TDriver tDriver1 = driverService.selectById(tOrderLogistics.getDriverId());
//                    if (tDriver1!=null){
//                        platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
//                        platformVO.setDriverPhone(tDriver1.getPhone());
//                    }
//                    platformVO.setRemark(tOrderLogistics.getRemark());
//                    String string1 = settlementDetail.getPrice().toString();
//                    BigDecimal bigDecimal2 = new BigDecimal(string1);
//                    platformVO.setMoney(bigDecimal2);
//                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
//                    platformVO.setPayType("现金支付");
//                    // 查询是否结算
//                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
//                    if (payType!=null){
//                        if (payType == 1){
//                            // 查询已结算的
//                            if (settlementRecord1.getPaymentStatus() == 1){
//                                continue;
//                            }
//                        }
//                        if (payType == 2){
//                            // 查询未结算的
//                            if (settlementRecord1.getPaymentStatus() == 2){
//                                continue;
//                            }
//                        }
//                    }
//                    if (settlementRecord1.getPaymentStatus() == 2){
//                        // 已结算
//                        platformVO.setState(1);
//                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
//                        if (settlementRecord1.getDay()!=null){
//                            platformVO.setInsertTime(format.format(settlementRecord1.getDay()));
//                        }
//                    }else{
//                        // 未结算
//                        platformVO.setState(2);
//                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
//                    }
//                    res.add(platformVO);
//                    break;
//            }
//        }
        // 计算佣金总额
//        BigDecimal add = unBalance.add(balance);
        Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
@@ -1579,8 +1429,9 @@
    @RequestMapping(value = "/commission/list")
    @ResponseBody
    public Object list(Integer time,String insertTime,Integer state) {

        if (time == null){
            time = 1;
            time =1;
        }
        String beginTime = null;
        String endTime = null;
@@ -1640,31 +1491,33 @@
        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
        List<Income> incomes = new ArrayList<>();
        List<SettlementDetail> settlementDetails = new ArrayList<>();
        if (state!=null){
            switch (state){
                case 1:
                    // 已结算
                    // 查询已结算的
                    incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                            .eq("userType", 2)
                             .ne("type", 1)
                             .isNotNull("orderType")
                                .between("insertTime", start, end));
                    break;
                case 2:
                    // 未结算

                    break;
            }
        }else{
        if (time == null){
            incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                    .eq("userType", 2)
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .ne("type", 1)
                    .isNotNull("orderType")
                    .between("insertTime", start, end));
                    .isNotNull("orderType"));
        }else{
            if (time == 5){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .isNotNull("orderType"));
            }else{
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .isNotNull("orderType")
                        .between("insertTime", start, end));
            }
        }


        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time!=null && time!=5){
            settlementDetailEntityWrapper.between("createTime", start, end);
        }
        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
        List<PlatformVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -1678,6 +1531,9 @@
            platformVO.setState(1);
            switch (income.getOrderType()){
                case 1:
                    if (state!=null && state==2){
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    if (tOrderPrivateCar==null){
@@ -1689,19 +1545,12 @@
                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setDriverPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());
                    if (income.getInsertTime()!=null){
                        platformVO.setEndTime(format.format(income.getInsertTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    if (tOrderPrivateCar.getOrderMoney() != null){
                        String string = tOrderPrivateCar.getOrderMoney().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                    }else{
                        continue;
                    }
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    platformVO.setInsertTime(format.format(income.getInsertTime()));
                    if (tOrderPrivateCar.getPayType() == null){
                        continue;
                    }
@@ -1719,11 +1568,15 @@
                            platformVO.setPayType("现金支付");
                            break;
                    }

                    // 专车订单
                    balance = balance.add(new BigDecimal(income.getMoney()));
                    res.add(platformVO);
                    break;
                case 4:
                    if (state!=null && state==2){
                        continue;
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
@@ -1736,7 +1589,6 @@
                        platformVO.setDriverName(tDriver1.getFirstName()+tDriver1.getLastName());
                        platformVO.setDriverPhone(tDriver1.getPhone());
                    }

                    platformVO.setRemark(tOrderLogistics.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    if (income.getInsertTime()!=null){
@@ -1760,15 +1612,14 @@
                            platformVO.setPayType("现金支付");
                            break;
                    }

                    // 专车订单
                    balance = balance.add(new BigDecimal(income.getMoney()));
                    res.add(platformVO);
                    break;
            }
        }
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        settlementDetailEntityWrapper.between("createTime", start, end);
        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);

        // 查询所有现金支付的订单
        for (SettlementDetail settlementDetail : settlementDetails) {
            PlatformVO platformVO = new PlatformVO();
@@ -1794,34 +1645,24 @@
                    platformVO.setMoney(bigDecimal1);
                    platformVO.setPayType("现金支付");

                    // 查询是否结算
                    SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 1){
                                continue;
                            }
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        if (settlementRecord.getDay()!=null){
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }

                    res.add(platformVO);
                    break;
                case 4:
@@ -1843,30 +1684,19 @@
                    platformVO.setMoney(bigDecimal2);
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    platformVO.setPayType("现金支付");
                    // 查询是否结算
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord1.getPaymentStatus() == 1){
                                continue;
                            }
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord1.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord1.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        if (settlementRecord1.getDay()!=null){
                            platformVO.setEndTime(format.format(settlementRecord1.getDay()));
                        }
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));