2.0bug修改

无关风月

2024-07-22 13af2bc11b551befd11accfd66e601a013b57c6f

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

@@ -176,7 +176,7 @@
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            if (time == 5){
            if (time == 5 && insertTime==null){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
@@ -304,7 +304,9 @@
        }

        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time!=null && time!=5 ){
        if (time == 5 && insertTime==null){

        }else{
            settlementDetailEntityWrapper.between("createTime", start, end);
        }
        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
@@ -493,7 +495,7 @@
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time!=null && time == 5){
        if (time == 5 && insertTime==null){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
@@ -995,7 +997,7 @@
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time!=null && time == 5){
        if (time == 5 && insertTime==null){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
@@ -1446,7 +1448,7 @@
            LocalDate e = LocalDate.parse(endTime);
            start = s.atStartOfDay();
            end = e.atTime(LocalTime.MAX);
        }else if (time!=null) {
        }else{
            switch (time) {
                case 1:
                    // 获取当天的 00:00:00 和 23:59:59
@@ -1498,7 +1500,7 @@
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            if (time == 5){
            if (time == 5 && insertTime==null){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
@@ -1514,7 +1516,9 @@
            }
        }
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time!=null && time!=5){
        if (time == 5 && insertTime==null){

        }else{
            settlementDetailEntityWrapper.between("createTime", start, end);
        }
        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);