7.234

luodangjia

2024-07-24 3b56d93c50c2cde9738c8081a08cb657cbe6f087

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

@@ -314,8 +314,8 @@
            OrderCancel orderCancel = new OrderCancel();
            orderCancel.setOrderId(tReassign.getOrderId());
            orderCancel.setOrderType(tReassign.getOrderType());
            orderCancel.setReason("调度端取消订单");
            orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
            orderCancel.setReason("The platform cancels the order");
            orderCancel.setRemark("The platform cancels the order");
            orderCancel.setState(2);
            orderCancel.setInsertTime(new Date());
            orderCancel.setUserType(3);
@@ -476,8 +476,8 @@
                OrderCancel orderCancel = new OrderCancel();
                orderCancel.setOrderId(tReassign.getOrderId());
                orderCancel.setOrderType(tReassign.getOrderType());
                orderCancel.setReason("调度端取消订单");
                orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
                orderCancel.setReason("The platform cancels the order");
                orderCancel.setRemark("The platform cancels the order");
                orderCancel.setState(2);
                orderCancel.setInsertTime(new Date());
                orderCancel.setUserType(3);
@@ -540,8 +540,8 @@
            OrderCancel orderCancel = new OrderCancel();
            orderCancel.setOrderId(tReassign.getOrderId());
            orderCancel.setOrderType(tReassign.getOrderType());
            orderCancel.setReason("调度端取消订单");
            orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
            orderCancel.setReason("The platform cancels the order");
            orderCancel.setRemark("The platform cancels the order");
            orderCancel.setState(2);
            orderCancel.setInsertTime(new Date());
            orderCancel.setUserType(3);
@@ -556,23 +556,23 @@
            System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
        }

        //返回驾驶员处罚金
        TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
        originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
        itDriverService.updateById(originalDriver);

        //增加交易明细
        TPubTransactionDetails details = new TPubTransactionDetails();
        details.setUserId(originalDriver.getId());
        details.setInsertTime(new Date());
        details.setRemark("【小件物流】:改派失败或订单取消");
        details.setMoney(new BigDecimal(tReassign.getMoney()));
        details.setState(1);
        details.setType(1);
        details.setUserType(2);
        details.setOrderType(tReassign.getOrderType());
        details.setOrderId(tReassign.getOrderId());
        itPubTransactionDetailsService.insert(details);
//        //返回驾驶员处罚金
//        TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
//        originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
//        itDriverService.updateById(originalDriver);
//
//        //增加交易明细
//        TPubTransactionDetails details = new TPubTransactionDetails();
//        details.setUserId(originalDriver.getId());
//        details.setInsertTime(new Date());
//        details.setRemark("【小件物流】:改派失败或订单取消");
//        details.setMoney(new BigDecimal(tReassign.getMoney()));
//        details.setState(1);
//        details.setType(1);
//        details.setUserType(2);
//        details.setOrderType(tReassign.getOrderType());
//        details.setOrderId(tReassign.getOrderId());
//        itPubTransactionDetailsService.insert(details);
        return SUCCESS_TIP;
    }