Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-22 eeebf2d723433f916ba9c33cce92431165dd64c7

Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java

 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()));

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

@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -21,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.temporal.TemporalAdjusters;
@@ -86,6 +89,17 @@
    private ISysCouponRecordService sysCouponRecordService;
    @Autowired
    private IUserActivityDiscount1Service userActivityDiscount1Service;

    public static void main(String[] args) {
        String temp = "[{\"money\":14.46,\"id\":91},{\"money\":1,\"id\":90}]";
        JSONArray objects = JSONArray.parseArray(temp);
        BigDecimal temp1 = new BigDecimal(BigInteger.ZERO);
        for (int i = 0; i < objects.size(); i++) {
            String string = objects.getJSONObject(i).getString("money");
            temp1 = temp1.add(new BigDecimal(string));
        }
        System.err.println(temp1);
    }
    /**
     * 使用补贴统计
     */
@@ -168,60 +182,107 @@
        List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
        // 司机提现
        List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
        // 司机提现wrapper

        Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 2)
                .between("handleTime", start, end);
                ;
        // 专车wrapper
        Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
                .isNotNull("activityId")
                .isNotNull("discountMoney")


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


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


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


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


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


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

                ;
        if (time!=null && time == 5){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    ;
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
            // 已使用优惠券记录wrapper
           between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6);
            // 司机提现
            between44 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("purpose", 6);
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    .between("handleTime", start, end);
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);
            // 小件物流wrapper
             between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);
            // 已使用优惠券记录wrapper
            between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);
            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);
            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);
            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .between("createTime", start, end);
            // 司机提现
            between44 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("purpose", 6)
                    .between("createTime", start, end);
        }
        // 司机提现wrapper
        if (type!=null){
            switch (type){
                case 1:
@@ -280,9 +341,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()));
@@ -293,12 +351,9 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());

            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()));
@@ -309,16 +364,20 @@
                grantVO.setName(tUser.getNickName());
            }
            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("红包");
            grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
            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));
            }
            grantVO.setAmount(temp.toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -328,13 +387,16 @@
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
        }
        for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
            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));
            }
            grantVO.setAmount(temp.toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -345,9 +407,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("优惠券");
@@ -361,9 +420,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("优惠券");
@@ -515,62 +571,105 @@
        List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
        // 司机提现
        List<BalanceUsageRecord> driverWithdrawal = new ArrayList<>();
        // 司机提现wrapper
        Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
                .eq("state", 2)
                .eq("userType", 2)
                .between("handleTime", start, end);
                ;
        // 专车wrapper
        Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
                .isNotNull("activityId")
                .isNotNull("discountMoney")
                .between("insertTime", start, end)

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

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


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


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

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


                ;
        // 司机已消费金额
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                .ne("purpose", 6)
                .between("createTime", start, end);
                ;
        // 司机提现
        Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
                .eq("purpose", 6)
                .between("createTime", start, end);
                ;
        if (time!=null && time == 5){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
            ;
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney");
            // 已使用优惠券记录wrapper
            between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney");
            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney");
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6);
            // 司机提现
            between44 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("purpose", 6);
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    .between("handleTime", start, end);
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("activityId")
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end);
            // 已使用优惠券记录wrapper
            between2 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);
            between22 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("couponId")
                    .isNotNull("couponMoney")
                    .between("insertTime", start, end);
            // 已使用红包记录wrapper
            between3 = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);
            between33 = new EntityWrapper<TOrderLogistics>()
                    .isNotNull("redPacketId")
                    .isNotNull("redPacketMoney")
                    .between("insertTime", start, end);
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .between("createTime", start, end);
            // 司机提现
            between44 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("purpose", 6)
                    .between("createTime", start, end);
        }

        if (type!=null){
            switch (type){
@@ -669,7 +768,13 @@
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
            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));
            }
            grantVO.setAmount(temp.toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -685,7 +790,13 @@
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            grantVO.setAmount(userRedPacketRecord.getPayMoney().toString());
            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));
            }
            grantVO.setAmount(temp.toString());
            TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId());
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
@@ -879,31 +990,69 @@

        // 专车wrapper
        Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
                .isNotNull("discountMoney")
                .between("insertTime", start, end)

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


                ;
        // 优惠券领取记录wrapper
        Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
                .ne("couponUseType", 2)
                .ne("couponUseType", 3)
                .between("insertTime", start, end);
                ;
        // 红包领取记录wrapper
        Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
                .ne("orderType", 2)
                .ne("orderType", 3)
                .between("insertTime", start, end);
                ;
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                .eq("carryOut", 2)
                .between("insertTime", start, end);
                ;
        if (time == 5){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")

                    ;
            // 小件物流wrapper
           between1 = new EntityWrapper<TOrderLogistics>()

                    .isNotNull("discountMoney")
                    ;
            // 优惠券领取记录wrapper
            between2 = new EntityWrapper<UserCouponRecord>()
                    .ne("couponUseType", 2)
                    .ne("couponUseType", 3)
                    ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    ;
        }else{
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end)
            ;
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .between("insertTime", start, end)
                    .isNotNull("discountMoney")
            ;
            // 优惠券领取记录wrapper
            between2 = new EntityWrapper<UserCouponRecord>()
                    .ne("couponUseType", 2)
                    .ne("couponUseType", 3)
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .between("insertTime", start, end);
        }

        if (type!=null){

            switch (type){
@@ -952,10 +1101,6 @@
            if (tOrderPrivateCar.getDiscountMoney()==null){
                continue;
            }
            if (tOrderPrivateCar.getState() != 8 && tOrderPrivateCar.getState()!=9){
                    continue;

            }
            discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -978,9 +1123,7 @@
            if (tOrderPrivateCar.getDiscountMoney()==null){
                continue;
            }
            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()));
@@ -1148,34 +1291,68 @@

        // 专车wrapper
        Wrapper<TOrderPrivateCar> between = new EntityWrapper<TOrderPrivateCar>()
                .between("insertTime", start, end)
                .isNotNull("discountMoney")
//                .eq("state", 8)
//                .or()
//                .eq("state", 9)

                ;
        // 小件物流wrapper
        Wrapper<TOrderLogistics> between1 = new EntityWrapper<TOrderLogistics>()
                .between("insertTime", start, end)
                .isNotNull("discountMoney")
//                .eq("state", 8)
//                .or()
//                .eq("state", 9)

                ;
        // 优惠券领取记录wrapper
        Wrapper<UserCouponRecord> between2 = new EntityWrapper<UserCouponRecord>()
                .ne("couponUseType", 2)
                .ne("couponUseType", 3)
                .between("insertTime", start, end);
                ;
        // 红包领取记录wrapper
        Wrapper<UserRedPacketRecord> between3 = new EntityWrapper<UserRedPacketRecord>()
                .ne("orderType", 2)
                .ne("orderType", 3)
                .between("insertTime", start, end);
                ;
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                .eq("carryOut", 2)
                .between("insertTime", start, end);
                ;
        if (time == 5){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")

            ;
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()

                    .isNotNull("discountMoney")
            ;
            // 优惠券领取记录wrapper
            between2 = new EntityWrapper<UserCouponRecord>()
                    .ne("couponUseType", 2)
                    .ne("couponUseType", 3)
            ;
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
            ;
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
            ;
        }else{
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")
                    .between("insertTime", start, end)
            ;
            // 小件物流wrapper
            between1 = new EntityWrapper<TOrderLogistics>()
                    .between("insertTime", start, end)
                    .isNotNull("discountMoney")
            ;
            // 优惠券领取记录wrapper
            between2 = new EntityWrapper<UserCouponRecord>()
                    .ne("couponUseType", 2)
                    .ne("couponUseType", 3)
                    .between("insertTime", start, end);
            // 红包领取记录wrapper
            between3 = new EntityWrapper<UserRedPacketRecord>()
                    .between("insertTime", start, end);
            // 司机奖励
            between4 = new EntityWrapper<DriverActivityHistory>()
                    .eq("carryOut", 2)
                    .between("insertTime", start, end);
        }
        if (type!=null){

            switch (type){

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

@@ -92,11 +92,8 @@
    @RequestMapping(value = "/direct")
    @ResponseBody
    public ResultUtil direct(String ids, Integer redId) {

        System.err.println("========="+ids+"======="+redId);
        Double money = 0D;


        SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.selectById(redId);
        if(null != sysRedPacketRecord){
            Integer type = sysRedPacketRecord.getType();
@@ -131,7 +128,7 @@
            userRedPacketRecord.setRemainingAmount(money);
            userRedPacketRecord.setInsertTime(new Date());
            userRedPacketRecord.setCompanyId(1);
            userRedPacketRecord.setState(0);
            userRedPacketRecord.setState(1);
            userRedPacketRecord.setOrderId(null);
            userRedPacketRecord.setRedPacketActivityId(redId);
//            userRedPacketRecord.setOrderType(3);

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

@@ -136,6 +136,8 @@
        model.addAttribute("zcModelList",zcModelList);
        List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
        model.addAttribute("kcModelList",kcModelList);
        List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
        model.addAttribute("xjModelList",xjModelList);
        List<TCarColor> state = carColorService.selectList(new EntityWrapper<TCarColor>().eq("state", 1));
        model.addAttribute("color", state);
        return PREFIX + "tCar_add.html";
@@ -198,6 +200,7 @@
        Integer six = 1;
        Integer zcModel = 0;
        Integer kcModel = 0;
        Integer xjModel = 0;
        for (TCarService obj : serviceList){
            if (obj.getType() == 1){
                one = 2;
@@ -211,7 +214,8 @@
                kcModel = obj.getServerCarModelId();
            }
            if (obj.getType() == 4){
                four = 2;
                four = 4;
                xjModel = obj.getServerCarModelId();
            }
            if (obj.getType() == 5){
                five = 2;
@@ -228,11 +232,14 @@
        model.addAttribute("six",six);
        model.addAttribute("zcModel",zcModel);
        model.addAttribute("kcModel",kcModel);
        model.addAttribute("xjModel",xjModel);

        List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("zcModelList",zcModelList);
        List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
        model.addAttribute("kcModelList",kcModelList);
        List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
        model.addAttribute("xjModelList",xjModelList);

        //车辆品牌
        List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
@@ -258,6 +265,7 @@
        Integer six = 1;
        Integer zcModel = 0;
        Integer kcModel = 0;
        Integer xjModel = 0;
        for (TCarService obj : serviceList){
            if (obj.getType() == 1){
                one = 2;
@@ -267,12 +275,19 @@
                four = 2;
                zcModel = obj.getServerCarModelId();
            }
            if (obj.getType() == 4){
                four = 4;
                xjModel = obj.getServerCarModelId();
            }
        }
        model.addAttribute("one",one);
        model.addAttribute("four",four);
        model.addAttribute("zcModel",zcModel);
        model.addAttribute("xjModel",xjModel);
        List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("zcModelList",zcModelList);
        List<TServerCarmodel> xjModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state", 1));
        model.addAttribute("xjModelList",xjModelList);
        LogObjectHolder.me().set(tCar);
        return PREFIX + "tCar_auth.html";
    }
@@ -441,7 +456,7 @@
     */
    @RequestMapping(value = "/add")
    @ResponseBody
    public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) throws Exception {
    public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel) throws Exception {
        TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
        if(null != tCar1){
            throw new Exception("车牌号重复");
@@ -497,8 +512,8 @@
            service.setType(Integer.valueOf(serverArray[i]));
            if (1 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(zcModel));
            }else if (3 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(kcModel));
            }else if (4 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(xjModel));
            }
            tCarServiceService.insert(service);
        }
@@ -529,7 +544,7 @@
     */
    @RequestMapping(value = "/update")
    @ResponseBody
    public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel)throws Exception {
    public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel,String xjModel)throws Exception {
        TCar tCar1 = tCarService.selectOne(new EntityWrapper<TCar>().eq("state", 1).ne("authState", 4).eq("carLicensePlate", tCar.getCarLicensePlate()));
        if(null != tCar1 && tCar.getId().compareTo(tCar1.getId()) != 0){
            throw new Exception("车牌号重复");
@@ -576,8 +591,8 @@
            service.setType(Integer.valueOf(serverArray[i]));
            if (1 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(zcModel));
            }else if (3 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(kcModel));
            }else if (4 == service.getType()){
                service.setServerCarModelId(Integer.valueOf(xjModel));
            }
            tCarServiceService.insert(service);
        }

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

@@ -212,7 +212,7 @@
    @ResponseBody
    public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception {
        TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);

        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
        //添加已收入明细
        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
        Double taxi = company.getSpeMoney().doubleValue();
@@ -245,7 +245,7 @@
        }

        orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);
        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
        orderPrivateCar.setState(7);
        tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);

        return SUCCESS_TIP;

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java

@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -17,6 +19,7 @@
 * @since 2020-09-24
 */
@TableName("t_order_logistics")
@Data
public class TOrderLogistics extends Model<TOrderLogistics> {

    private static final long serialVersionUID = 1L;
@@ -169,7 +172,7 @@
    /**
     * 红包记录id
     */
    private Integer redPacketId;
    private String redPacketId;
    /**
     * 优惠券id
     */
@@ -553,13 +556,6 @@
        this.couponMoney = couponMoney;
    }

    public Integer getRedPacketId() {
        return redPacketId;
    }

    public void setRedPacketId(Integer redPacketId) {
        this.redPacketId = redPacketId;
    }

    public Integer getCouponId() {
        return couponId;

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java

@@ -205,7 +205,7 @@
    /**
     * 红包记录id
     */
    private Integer redPacketId;
    private String redPacketId;
    /**
     * 优惠券id
     */
@@ -639,13 +639,7 @@
        this.couponMoney = couponMoney;
    }

    public Integer getRedPacketId() {
        return redPacketId;
    }

    public void setRedPacketId(Integer redPacketId) {
        this.redPacketId = redPacketId;
    }

    public Integer getCouponId() {
        return couponId;

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/commission.html

@@ -57,14 +57,21 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="time" name="时间" >
                                <option value="">今日</option>
                                <option value="1">今日</option>
                                <option value="2">本周</option>
                                <option value="3">本月</option>
                                <option value="4">全年</option>
                            </#SelectCon>
                        <div class="col-sm-3">
                            <div class="input-group">
                                <div class="input-group-btn open">
                                    <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                        时间
                                    </button>
                                </div>
                                <select class="form-control" id="time" onchange="tradeYse()">
                                    <option value="1">今日</option>
                                    <option value="2">本周</option>
                                    <option value="3">本月</option>
                                    <option value="4">全年</option>
                                    <option value="5">全部</option>
                                </select>
                            </div>
                        </div>
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
@@ -116,5 +123,17 @@
        elem: '#insertTime'
        ,range: true
    });
    function tradeYse() {
        var time =document.getElementById("insertTime");

        if ("5" == $("#time").val()){
            time.value="";
            time.disabled = true;
        }else{
            time.value="";
            time.disabled = false;
        }
    }

</script>
@}

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html

@@ -59,14 +59,21 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="time" name="时间" >
                                <option value="">今日</option>
                                <option value="1">今日</option>
                                <option value="2">本周</option>
                                <option value="3">本月</option>
                                <option value="4">全年</option>
                            </#SelectCon>
                        </div>
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            时间
                                        </button>
                                    </div>
                                    <select class="form-control" id="time" onchange="tradeYse()">
                                        <option value="1">今日</option>
                                        <option value="2">本周</option>
                                        <option value="3">本月</option>
                                        <option value="4">全年</option>
                                        <option value="5">全部</option>
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
                            </div>
@@ -143,5 +150,16 @@
        elem: '#insertTime'
        ,range: true
    });
    function tradeYse() {
        var time =document.getElementById("insertTime");

        if ("5" == $("#time").val()){
            time.value="";
            time.disabled = true;
        }else{
            time.value="";
            time.disabled = false;
        }
    }
</script>
@}

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/settlementAllocation/settlementAllocation.html

@@ -16,7 +16,7 @@
                            </div>
                            <div class="form-group">
                                <input type="radio" name="type" value="2" ${null != item && item.type == '2' ? 'checked' : ''}> 每周&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                每周 <input type="number" min="1" max="7" class="date" value="${null != item && item.type == '2' ? item.day : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> 可结算
                                每周 <input type="number" min="1" max="7" class="date" value="${null != item && item.type == '2' ? item.day : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> (几)可结算
                            </div>
                            <div class="form-group">
                                每天超过 <input type="number" min="1" max="31" id="maxPrice" value="${null != item ? item.maxPrice : ''}" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;"/> 必须结算

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html

@@ -59,14 +59,21 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="time" name="时间" >
                                <option value="">今日</option>
                                <option value="1">今日</option>
                                <option value="2">本周</option>
                                <option value="3">本月</option>
                                <option value="4">全年</option>
                            </#SelectCon>
                        </div>
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            时间
                                        </button>
                                    </div>
                                    <select class="form-control" id="time" onchange="tradeYse()">
                                        <option value="1">今日</option>
                                        <option value="2">本周</option>
                                        <option value="3">本月</option>
                                        <option value="4">全年</option>
                                        <option value="5">全部</option>
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
                            </div>
@@ -131,5 +138,16 @@
        elem: '#insertTime'
        ,range: true
    });
    function tradeYse() {
        var time =document.getElementById("insertTime");

        if ("5" == $("#time").val()){
            time.value="";
            time.disabled = true;
        }else{
            time.value="";
            time.disabled = false;
        }
    }
</script>
@}

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html

@@ -72,13 +72,21 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="time" name="时间" >
                                <option value="1">今日</option>
                                <option value="2">本周</option>
                                <option value="3">本月</option>
                                <option value="4">全年</option>
                            </#SelectCon>
                        </div>
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            时间
                                        </button>
                                    </div>
                                    <select class="form-control" id="time" onchange="tradeYse()">
                                        <option value="1">今日</option>
                                        <option value="2">本周</option>
                                        <option value="3">本月</option>
                                        <option value="4">全年</option>
                                        <option value="5">全部</option>
                                    </select>
                                </div>
                            </div>
                            <div class="col-sm-3">
                                <#TimeCon id="insertTime" name="时间" isTime="false"/>
                            </div>
@@ -149,5 +157,16 @@
        elem: '#insertTime'
        ,range: true
    });
    function tradeYse() {
        var time =document.getElementById("insertTime");

        if ("5" == $("#time").val()){
            time.value="";
            time.disabled = true;
        }else{
            time.value="";
            time.disabled = false;
        }
    }
</script>
@}

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/tUser.html

@@ -52,7 +52,7 @@

                <div style="display: flex; justify-content: center;">
                    <button type="button" class="btn btn-primary button-margin" onclick="TUser.freezeUser()" id="">
                        <i class="fa fa-remove"></i>&nbsp;冻结
                        <i class="fa fa-remove"></i>&nbsp;派发
                    </button>
                </div>


 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html

@@ -58,7 +58,7 @@
                                    <label for="serverBox3"> 跨城出行 </label>
                                </div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4" onclick="TCarInfoDlg.xjServerClick()">
                                    <label for="serverBox4"> 市内小件物流 </label>
                                </div><!--
                                <div class="checkbox checkbox-success  checkbox-inline">
@@ -83,6 +83,17 @@
                            </select>
                        </div>
                    </div>
                    <div class="form-group" style="display: none;" id="xjModelDiv">
                        <label class="col-sm-3 control-label">市内小件物流车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="xjModel" name="xjModel">
                                <option value="">选择车型</option>
                                @for(obj in xjModelList){
                                <option value="${obj.id}">${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <!--
                    <div class="form-group" style="display: none;" id="kcModelDiv">
                        <label class="col-sm-3 control-label">跨城出行车型：</label>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_auth.html

@@ -12,7 +12,7 @@
                            <label for="serverBox1"> 专车 </label>
                        </div>
                        <div class="checkbox checkbox-success  checkbox-inline">
                            <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                            <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()">
                            <label for="serverBox4"> 市内小件物流 </label>
                        </div>
                    </div>
@@ -25,6 +25,17 @@
                        <option value="">选择车型</option>
                        @for(obj in zcModelList){
                        <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                        @}
                    </select>
                </div>
            </div>
            <div class="form-group" style="display: none;" id="xjModelDiv">
                <label class="col-sm-3 control-label">市内小件物流车型：</label>
                <div class="col-sm-9">
                    <select class="form-control" id="xjModel" name="xjModel">
                        <option value="">选择车型</option>
                        @for(obj in xjModelList){
                        <option value="${obj.id}"${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option>
                        @}
                    </select>
                </div>
@@ -94,6 +105,7 @@

        TCarInfoDlg.zcServerClick();
        TCarInfoDlg.kcServerClick();
        TCarInfoDlg.xjServerClick();

    });
</script>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -60,7 +60,7 @@
                                    <label for="serverBox3"> 跨城出行 </label>
                                </div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${4 == four ? 'checked=checked' : ''} onclick="TCarInfoDlg.xjServerClick()">
                                    <label for="serverBox4"> 市内小件物流 </label>
                                </div><!--
                                <div class="checkbox checkbox-success  checkbox-inline">
@@ -81,6 +81,17 @@
                                <option value="">选择车型</option>
                                @for(obj in zcModelList){
                                <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
                    </div>
                    <div class="form-group" style="display: none;" id="xjModelDiv">
                        <label class="col-sm-3 control-label">市内小件物流车型：</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="xjModel" name="xjModel">
                                <option value="">选择车型</option>
                                @for(obj in xjModelList){
                                <option value="${obj.id}"  ${obj.id == xjModel ? 'selected=selected' : ''}>${obj.name}</option>
                                @}
                            </select>
                        </div>
@@ -209,7 +220,7 @@
        }

        TCarInfoDlg.zcServerClick();
        TCarInfoDlg.kcServerClick();
        TCarInfoDlg.xjServerClick();

    });
</script>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -77,8 +77,8 @@
                        <fieldset>
                            <label class="col-sm-3 control-label">经营业务：</label>
                            <div class="col-sm-9">
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox1" value="1">
                                <div class="checkbox checkbox-success  checkbox-inline" >
                                    <input type="checkbox" checked name="serverBox" disabled id="serverBox1" value="1">
                                    <label for="serverBox1"> 专车 </label>
                                </div><!--
                                <div class="checkbox checkbox-success  checkbox-inline">
@@ -89,8 +89,8 @@
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 跨城出行 </label>
                                </div>-->
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox4" value="4">
                                <div class="checkbox checkbox-success  checkbox-inline" >
                                    <input type="checkbox" checked name="serverBox" disabled id="serverBox4" value="4">
                                    <label for="serverBox4"> 市内小件物流 </label>
                                </div><!--
                                <div class="checkbox checkbox-success  checkbox-inline">

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html

@@ -3,7 +3,7 @@
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <div class="ibox-title">
                <h5>专车车型设置管理</h5>
                <h5>车型设置管理</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetAdd.html

@@ -13,7 +13,7 @@
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">红包可抵扣比例：</label>
                        <div class="col-sm-9" style="display: flex;">
                            <input style="width: 300px" class="form-control" id="proportion" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
                            <input style="width: 300px" class="form-control" id="proportion" name="proportion" placeholder="请输入红包可抵扣比例" type="number">
                            <span id="priceLabel1"  style="margin-left: 5px;margin-top: 5px">%</span>
                        </div>
                    </div>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html

@@ -14,7 +14,7 @@
                    <div class="form-group" >
                        <label class="col-sm-3 control-label">红包可抵扣比例：</label>
                        <div class="col-sm-9" style="display: flex;">
                            <input style="width: 300px" class="form-control" id="proportion" value="${data.deductionRatio}" name="proportion" placeholder="请输入红包可抵扣比例" type="text">
                            <input style="width: 300px" class="form-control" id="proportion" value="${data.deductionRatio}" name="proportion" placeholder="请输入红包可抵扣比例" type="number">
                            <span id="priceLabel1"  style="margin-left: 5px;margin-top: 5px">%</span>
                        </div>
                    </div>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -353,7 +353,7 @@
                                               @}else{
                                               value=""
                                               @}
                                               name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;元取消费用；&nbsp;&nbsp;
                                               name="yyCancel2" id="yyCancel2" class="form-control newWidth" />&nbsp;GHS取消费用；&nbsp;&nbsp;
                            里程费&nbsp;<input type="text" oninput="checkIsDouble(this)"
                                               @if(isNotEmpty(mileageFee1)){
                                               value="${mileageFee1}"
@@ -513,14 +513,16 @@
        }
    }

    var regDouble = /^[0-9]\d*(\.\d*[0-9])?$/;
    var regDouble = /^\d+(\.\d{1,2})?$/;
    function checkIsDouble(obj){
        var num = $(obj).val();
        console.log("看看数字");
        console.log(num)
        if(!regDouble.test(num)){
            layer.msg("小数/正整数格式");
            console.log("进入")
            layer.msg("小数不超过两位/正整数格式");
        }
    }

    //验证是否输入正整数
    var regInt = /^[0-9]\d*$/;
    function checkIsInt(obj){
@@ -605,6 +607,8 @@
        var reserveTime = $('#reserveTime').val().trim();
        var reserveNext = $('#reserveNext').val().trim();

        console.log("提交")
        console.log(ptCancel2)
        if ("" == one || "" == two || "" == three
            || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
            || '' == zcAssignOrder || '' == zcPeople
@@ -635,8 +639,10 @@
            || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)/* || !regDouble.test(czcAssignOrder) || !regInt.test(czcPeople)*/

            || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4)|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
            || !regInt.test(km) || !regInt.test(km2)
            || !regDouble.test(km) || !regDouble.test(km2)
            || !regDouble.test(kmMinute) || !regDouble.test(kmMinute2)
            || !regDouble.test(reserveMoney)
            || !regDouble.test(yyCancel2)
            /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) {
            Feng.info("格式不正确!");
            return ;

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js

@@ -251,7 +251,17 @@
    table.setPaginationType("client");
    TUser.table = table.init();
});
TUser.tradeYse = function () {
    var time =document.getElementById("insertTime");

    if ("" == $("#time").val()){
        time.value="";
        time.disabled = true;
    }else{
        bTime.value="";
        bTime.disabled = false;
    }
};
TUser.sendAjaxRequest = function(url,type,data){
    $.ajax({
        url : url,

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/settlementAllocation/settlementAllocation.js

@@ -72,10 +72,10 @@
        return
    }
    let maxPrice = $('#maxPrice').val();
    if('' == maxPrice || null == maxPrice){
        Feng.error("请输入每日结算金额")
        return
    }
    // if('' == maxPrice || null == maxPrice){
    //     Feng.error("请输入每日结算金额")
    //     return
    // }
    let json = {
        type: $(type).val(),
        day: day,

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js

@@ -374,6 +374,7 @@
    ajax.set(this.tCarInfoData);
    ajax.set("serverBox",serverBox.toString());
    ajax.set("zcModel",$("#zcModel").val());
    ajax.set("xjModel",$("#xjModel").val());
    ajax.set("kcModel",$("#kcModel").val());
    ajax.set("roleType",roleType);
    if (1 == roleType){
@@ -446,6 +447,7 @@
    ajax.set("serverBox",serverBox.toString());
    ajax.set("zcModel",$("#zcModel").val());
    ajax.set("kcModel",$("#kcModel").val());
    ajax.set("xjModel",$("#xjModel").val());
    ajax.set("roleType",roleType);
    if (1 == roleType){
        ajax.set("companyType",companyType);
@@ -566,6 +568,17 @@
        $("#zcModelDiv").hide();
    }
}
/**
 * 小件物流服务被点击
 */
TCarInfoDlg.xjServerClick = function () {
    var serverBox1 = $('#serverBox4').prop('checked');
    if (serverBox1){
        $("#xjModelDiv").show();
    } else {
        $("#xjModelDiv").hide();
    }
}

/**
 * 跨城服务被点击

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js

@@ -80,7 +80,7 @@
TServerCarmodel.openAddTServerCarmodel = function () {
    var index = layer.open({
        type: 2,
        title: '添加专车车型设置',
        title: '添加车型设置',
        area: ['800px', '420px'], //宽高
        fix: false, //不固定
        maxmin: true,
@@ -93,7 +93,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '修改专车车型设置',
            title: '修改车型设置',
            area: ['800px', '420px'], //宽高
            fix: false, //不固定
            maxmin: true,

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js

@@ -98,6 +98,12 @@
            temp = radioButtons[i].value;
        }
    }
    console.log("车型图片")
    console.log($("#img").val())
    if ("" == $("#img").val()){
        Feng.error("请上传车型图片");
        return;
    }
    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/add", function(data){
        if (500 == data.code){
@@ -137,6 +143,7 @@
            temp = radioButtons[i].value;
        }
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tServerCarmodel/update", function(data){
        Feng.success("修改成功!");

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js

@@ -66,7 +66,7 @@
    if (this.check()) {
        var index = layer.open({
            type: 2,
            title: '编辑跨城站点',
            title: '编辑红包支付设置',
            area: ['100%', '100%'], //宽高
            fix: false, //不固定
            maxmin: true,

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSetInfo.js

@@ -14,6 +14,10 @@
        Feng.info("请输入可红包抵扣比例");
        return;
    }
    if (proportion>100){
        Feng.info("红包抵扣比例不能大于100");
        return;
    }
    var startTime = $("#startTime").val();
    if ("" == startTime){
        Feng.info("请选择生效时间");
@@ -39,6 +43,10 @@
        Feng.info("请输入可红包抵扣比例");
        return;
    }
    if (proportion>100){
        Feng.info("红包抵扣比例不能大于100");
        return;
    }
    var startTime = $("#startTime").val();
    var id = $("#id").val();
    if ("" == startTime){