新增加功能

zhibing.pu

2024-04-19 2e366b939271b6ea338641f8a72d1bcd2182dbe7

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -584,7 +584,7 @@
            case 3://城际（没有此流程）
                break;
            case 4://
                break;
                return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee);
            case 5:
                break;
            case 6:
@@ -675,7 +675,7 @@
            case 3://城际（没有此流程）
                return null;
            case 4://
                break;
                return orderLogisticsService.queryOrderInfo(language, orderId);
            case 5:
                break;
            case 6:
@@ -980,6 +980,26 @@
                    redisUtil.setStrValue("VEHICLE", jsonArray.toJSONString());
                }
                break;
            case 4:
                OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
                if(orderLogistics.getState() == 8 || orderLogistics.getState() == 9){
                    return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.");
                }
                if(orderLogistics.getState() != 7){
                    return ResultUtil.error(language == 1 ? "订单不在待支付，无法完成订单" : language == 2 ? "The order is no longer with Pending Payment, unable to complete the order." : "La commande n’est plus en attente de paiement, il est impossible de terminer la commande.");
                }
                orderLogistics.setPayManner(2);//其他方式支付
                orderLogistics.setRedPacketMoney(0D);
                orderLogistics.setCouponMoney(0D);
                orderLogistics.setDiscount(0D);
                orderLogistics.setDiscountMoney(0D);
                orderLogistics.setPayMoney(orderLogistics.getOrderMoney());
                orderLogistics.setState(8);
                orderLogisticsService.updateById(orderLogistics);
                userId = orderLogistics.getUserId();
                driverId = orderLogistics.getDriverId();
                state = orderLogistics.getState();
                break;
        }


@@ -1011,6 +1031,8 @@
                return orderPrivateCarService.queryMoneyInfo(orderId);
            case 2:
                break;
            case 4:
                return orderLogisticsService.queryMoneyInfo(orderId);
        }
        return null;
    }