From 687d0fc2de844e09864cc2ea2b24550069a50546 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 16:00:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
index 300ce2f..024712f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -82,8 +82,8 @@
insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
insert.setInfo(pricingDetail.getInfo());
- String title = getRoleNameByParam(pricingDetail.getBasePrice(),pricingDetail.getBaseTime(),pricingDetail.getUnitPrice(),pricingDetail.getUnitTime());
- String info = getRoleNameByParam(pricingDetail.getHolidayBasePrice(),pricingDetail.getHolidayBaseTime(),pricingDetail.getHolidayUnitPrice(),pricingDetail.getHolidayUnitTime());;
+ String title = getRoleNameByParam(insert.getBasePrice(),insert.getBaseTime(),insert.getUnitPrice(),insert.getUnitTime());
+ String info = getRoleNameByParam(insert.getHolidayBasePrice(),insert.getHolidayBaseTime(),insert.getHolidayUnitPrice(),insert.getHolidayUnitTime());;
insert.setTitle(title);//宸ヤ綔鏃ヨ浠烽厤缃鍒�
insert.setInfo(info);//鑺傚亣鏃ヨ浠烽厤缃鍒�
pricingDetailMapper.insert(insert);
@@ -93,7 +93,7 @@
public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
String title = "璁¤垂瑙勫垯锛�";
if(baseTime < 0){
- title = basePrice.doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
}else {
title = "璧锋";
int time = baseTime / 60;
@@ -104,8 +104,8 @@
if(min >0){
title += min+"鍒嗛挓";
}
- title += basePrice.doubleValue()
- +"鍏冿紝瓒呰繃鍚�"+unitPrice.doubleValue()+"鍏�/"
+ title += basePrice.divide(new BigDecimal(100)).doubleValue()
+ +"鍏冿紝瓒呰繃鍚�"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"鍏�/"
+unitTime+"鍒嗛挓";
}
return title;
--
Gitblit v1.9.3