From 8bf400b67418a4a81185a4a302fdbdfce2cdf018 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 11:53:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 6 +++---
1 files changed, 3 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..ea23ebc 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+"鍒嗛挓";
}
--
Gitblit v1.9.3