提交代码

zhibing.pu

2024-06-28 b408d5145a89ddd1690b17e19eb4fc5e08d18b17

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

@@ -73,6 +73,12 @@
        if(price.size() == 0){
            return ResultUtil.error("未获取到可服务的车型", new ArrayList<>());
        }
        price.sort(new Comparator<ServerCarModelWarpper>() {
            @Override
            public int compare(ServerCarModelWarpper o1, ServerCarModelWarpper o2) {
                return o1.getAmount().compareTo(o2.getAmount());
            }
        });
        return ResultUtil.success(price);
    }

@@ -235,7 +241,7 @@
                }
                amount = num1 + (d1 * num4) + (t1 * num5) + (wait * num7) + yt1 + yt2 + yt3;
                ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
                serverCarModelWarpper.setAmount(new BigDecimal(amount).multiply(new BigDecimal(0.85)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
                serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
                serverCarModelWarpper.setMileage(d);
                serverCarModelWarpper.setDuration(t);
                data.add(serverCarModelWarpper);