xuhy
4 天以前 73147c6034c1c67db96eaa8d76fdf86104a5a2ce
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -365,6 +365,9 @@
        try {
            String[] split = orderId.split(",");
            Double aDouble = orderService.queryReassignMoney(Integer.valueOf(split[0]), orderType);
            if(Objects.isNull(aDouble)){
                return ResultUtil.error("未设置改派金额",null);
            }
            BaseWarpper baseWarpper = new BaseWarpper();
            if(orderType == 3){
                aDouble = aDouble * split.length;
@@ -542,6 +545,9 @@
            transactionDetailsService.saveDataTaxi(driver.getId(), "完成订单", moneyTwo, 1, 1, 2, 2, orderTaxi.getId(),placeOrderWay,company.getId());
            driverService.updateById(driver);
            pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
            return ResultUtil.success();
        }catch (Exception e){
            e.printStackTrace();