修改bug

Pu Zhibing

2024-11-09 f85ea638d98b302c590e65f00e6912d91601613c

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

@@ -221,7 +221,10 @@
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
                            .eq("id", income.getIncomeId())
                            .between("insertTime", start, end));
                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -289,7 +292,10 @@
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
                            .eq("id", income.getIncomeId())
                            .between("insertTime", start, end));
                    if (tOrderLogistics==null){
                        continue;
                    }
@@ -367,7 +373,10 @@
                case 1:

                    // 专车订单
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
                            .eq("id", settlementDetail.getOrderId())
                            .between("insertTime", start, end));
                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -415,7 +424,10 @@
                case 4:
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
                            .eq("id", settlementDetail.getOrderId())
                            .between("insertTime", start, end));
                    if (tOrderLogistics==null){
                        continue;
                    }
@@ -1921,7 +1933,11 @@
                        continue;
                    }
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
                            .eq("id", income.getIncomeId())
                            .between("insertTime", start, end));

                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -1989,7 +2005,10 @@
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
                            .eq("id", income.getIncomeId())
                            .between("insertTime", start, end));
                    if (tOrderLogistics==null){
                        continue;
                    }
@@ -2057,7 +2076,10 @@
            switch (settlementDetail.getOrderType()){
                case 1:
                    // 专车订单
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
//                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
                            .eq("id", settlementDetail.getOrderId())
                            .between("insertTime", start, end));
                    if (tOrderPrivateCar==null){
                        continue;
                    }
@@ -2103,7 +2125,10 @@
                case 4:
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
//                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
                    TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
                            .eq("id", settlementDetail.getOrderId())
                            .between("insertTime", start, end));
                    if (tOrderLogistics==null){
                        continue;
                    }