From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 23931d8..25b76a0 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
@@ -93,9 +93,9 @@
public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
String title = "璁¤垂瑙勫垯锛�";
if(baseTime < 0){
- title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
}else {
- title = "璧锋";
+ title += "璧锋";
int time = baseTime / 60;
int min = baseTime % 60;
if(time > 0){
@@ -104,7 +104,7 @@
if(min >0){
title += min+"鍒嗛挓";
}
- title += basePrice.doubleValue()
+ title += basePrice.divide(new BigDecimal(100)).doubleValue()
+"鍏冿紝瓒呰繃鍚�"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"鍏�/"
+unitTime+"鍒嗛挓";
}
@@ -123,6 +123,10 @@
//鍙傛暟閿欒
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()));
+ pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()));
+ pricingDetail.setUnitTime(Constants.formatIntegerNum(pricingDetail.getUnitTime()));
+ pricingDetail.setHolidayUnitTime(Constants.formatIntegerNum(pricingDetail.getHolidayUnitTime()));
if ( pricingDetail.getBaseTime() < 0){
pricingDetail.setBaseTime(-1);
}
--
Gitblit v1.9.3