From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 96e25b1..4d0f278 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
@@ -91,11 +91,11 @@
}
public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
- String title = "";
+ String title = "璁¤垂瑙勫垯锛�";
if(baseTime < 0){
- title = "瑙勫垯锛�"+Constants.translateMoney(basePrice).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ title = Constants.translateMoney(basePrice).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 = Constants.translateMoney(unitPrice).doubleValue()
+ title += Constants.translateMoney(unitPrice).doubleValue()
+"鍏冿紝瓒呰繃鍚�"+Constants.translateMoney(basePrice).doubleValue()+"鍏�/"
+unitTime+"鍒嗛挓";
}
--
Gitblit v1.9.3