2.0bug修改

无关风月

2024-12-12 69cc0f4dd365a38e5cb16866d0ccd738baf53042

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

@@ -1821,10 +1821,24 @@
        Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
                .stream()
                .collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
        Map<Integer, OrderCancel> orderCancelRecordMap = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
        // 专车取消订单
        Map<Integer, OrderCancel> orderCancelRecordMap1 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
                        .eq("orderType",1)
                        .eq("state",2)
                        .isNotNull("payType")
                        .isNotNull("money")
                )
                .stream()
                .collect(Collectors.toMap(OrderCancel::getId, user -> user));
                .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
        // 小件物流取消
        Map<Integer, OrderCancel> orderCancelRecordMap2 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
                        .eq("state",2)
                        .isNotNull("payType")
                        .isNotNull("money")
                        .eq("orderType",4)
                )
                .stream()
                .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
        // 已结算金额
        BigDecimal balance = new BigDecimal("0");
        // 未结算金额
@@ -1861,7 +1875,7 @@
                    }
                    if (tOrderPrivateCar.getState() == 10){
                        // 查询取消订单 用户支付方式
                        OrderCancel orderCancel = orderCancelRecordMap.get(tOrderPrivateCar.getId());
                        OrderCancel orderCancel = orderCancelRecordMap1.get(tOrderPrivateCar.getId());
                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){
                                case 1:
@@ -1930,7 +1944,7 @@
                    if (tOrderLogistics.getState() == 10){
                        // 查询取消订单 用户支付方式

                        OrderCancel orderCancel = orderCancelRecordMap.get(tOrderLogistics.getId());
                        OrderCancel orderCancel = orderCancelRecordMap2.get(tOrderLogistics.getId());

                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){