线下支付

xuhy

2025-01-20 eddb5feca520566eddb5cda01fb4a9a0cdcec078

线下支付

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -515,7 +515,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "支付方式（1=OK平台收款，2=其他方式收款）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "支付方式（1=OK平台收款，2=其他方式收款，3=线下收款）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "行程费用（出租车必传）", name = "travelFee", required = false, dataType = "double"),
            @ApiImplicitParam(value = "停车费", name = "parkingFee", required = false, dataType = "double"),
            @ApiImplicitParam(value = "过路费", name = "crossingFee", required = false, dataType = "double"),

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -364,6 +364,9 @@
    @Override
    public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        if(type == 3){
            orderPrivateCar.setState(8);
        }else {
        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
        orderPrivateCar.setPayManner(type);
        orderPrivateCar.setParkMoney(null == parkingFee ? 0D : parkingFee);
@@ -371,6 +374,7 @@
        orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney());
        orderPrivateCar.setState(7);
        this.updateById(orderPrivateCar);
        }

        pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
        systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java

@@ -213,6 +213,9 @@
    @Override
    public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
        TOrderTransfer orderPrivateCar = this.selectById(orderId);
        if(type == 3){
            orderPrivateCar.setState(8);
        }else {
        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
        orderPrivateCar.setPayManner(type);
        orderPrivateCar.setParkMoney(null == parkingFee ? 0D : parkingFee);
@@ -220,6 +223,7 @@
        orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney());
        orderPrivateCar.setState(7);
        this.updateById(orderPrivateCar);
        }

        pushUtil.removeTask(orderId, 7);//删除定时任务，结束推送数据
        systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -431,7 +431,7 @@
    public ResultUtil confirmFees(Integer orderId, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
        OrderTaxi orderTaxi = this.selectById(orderId);
        orderTaxi.setPayManner(type);
        if(type == 2){//其他支付，不需要操作，直接完成订单
        if(type == 2 || type == 3){//其他支付，不需要操作，直接完成订单
            orderTaxi.setOrderMoney(0D);
            orderTaxi.setTravelMoney(0D);
            orderTaxi.setParkMoney(0D);

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

@@ -98,6 +98,8 @@
            }else {
                model.addAttribute("recordState",2);
            }
        }else {
            model.addAttribute("recordState","");
        }
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -78,6 +78,13 @@
                        <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}元"/>
                        <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}元"/>
                        <#label id="driverIncome" name="司机收益" value="${item.driverIncome}元"/>
                        @if(isNotEmpty(item.payManner) && item.payManner == 1){
                            <#label id="payManner" name="支付方式" value="线上支付"/>
                        @}else if(isNotEmpty(item.payManner) && item.payManner == 2){
                            <#label id="payManner" name="支付方式" value="其他"/>
                        @}else{
                            <#label id="payManner" name="支付方式" value="线下支付"/>
                        @}
                    </div>
                @}else{
                <h4 style="margin-left: 10%">暂无费用明细</h4>