From b408d5145a89ddd1690b17e19eb4fc5e08d18b17 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 28 六月 2024 09:34:06 +0800
Subject: [PATCH] 提交代码
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index 4c11ec2..8fe0995 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/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);
--
Gitblit v1.7.1