liujie
3 天以前 a73f1ac7a2d006b207f06534604100e01f6119a5
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java
@@ -845,12 +845,15 @@
        }
        return ResultUtil.error("异常");
    }
    //用户取消退款
    public void userCancelTuik(OrderRide orderRide){
        if(orderRide.getState()==2){//用户已经支付了订单但司机没有接单
            orderRide.setTuiMoney(orderRide.getMoney());
        }
        if(orderRide.getTuiMoney()>0){
        if(null != orderRide.getTuiMoney() && orderRide.getTuiMoney()>0){
            Financial financial= financialService.selectOne(new EntityWrapper<Financial>().eq("orderNum",orderRide.getOrderNum()));
            String finNum=OrdersUtil.getOrderNoForPrefix("fin");
            //todo 退款金额大于0需要退款
@@ -903,7 +906,9 @@
                return ResultUtil.paranErr("orderId不能为空");
            }
            OrderTravel orderTravel=orderTravelService.selectById(orderId);
            if(orderTravel!=null){
            if(null == orderTravel){
                return ResultUtil.error("无效的订单ID");
            }
                if(orderTravel.getState()==6){
                    return ResultUtil.error("该订单已取消");
                }
@@ -953,7 +958,6 @@
                    orderRide.setTuiMoney(orderRide.getMoney());
                    orderRideService.updateById(orderRide);
                    userCancelTuik(orderRide);
                }
            }
            return ResultUtil.success("");
@@ -1024,6 +1028,7 @@
                    /*修改用户接单数和司机提成*/
                    UserInfo userInfo=userInfoService.selectById(driverRide.getUserId());
                    userInfo.setBalance(userInfo.getBalance()+(orderRide.getMoney()-orderRide.getPlatformMoney()));
                    userInfo.setTotalOrders(userInfo.getTotalOrders() + 1);
                    userInfoService.updateById(userInfo);
                    Financial f=new Financial();
                    f.setAddTime(new Date());
@@ -1139,8 +1144,8 @@
            DriverRide driverRide=driverRideService.selectById(driverId);
            if(driverRide!=null){
                /*计算司机的评分*/
                driverRide.setEvaluateNum(driverRide.getEvaluateNum()+1);
                driverRide.setEvaluateScore(driverRide.getEvaluateScore()+score);
                driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
                driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
                driverRideService.updateById(driverRide);
            }
            /*标记订单已评价*/