Merge remote-tracking branch 'origin/master'

无关风月

昨天 e345b36025818615eb68d37819eaff312d1fb986

 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;