From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..eb2678a 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);
@@ -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 += (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
}else {
- title = "瑙勫垯锛氳捣姝�";
+ title += "璧锋";
int time = baseTime / 60;
int min = baseTime % 60;
if(time > 0){
@@ -104,8 +104,8 @@
if(min >0){
title += min+"鍒嗛挓";
}
- title = Constants.translateMoney(unitPrice).doubleValue()
- +"鍏冿紝瓒呰繃鍚�"+Constants.translateMoney(basePrice).doubleValue()+"鍏�/"
+ title += basePrice.divide(new BigDecimal(100)).doubleValue()
+ +"鍏冿紝瓒呰繃鍚�"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"鍏�/"
+unitTime+"鍒嗛挓";
}
return title;
@@ -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);
}
@@ -218,7 +222,7 @@
QueryWrapper<BaseParam> baseParamQuery = new QueryWrapper();
baseParamQuery.lambda()
.eq(BaseParam::getIsdeleted,Constants.ZERO)
- .eq(BaseParam::getType,Constants.THREE)
+ .in(BaseParam::getType,Constants.THREE,Constants.FOUR)
.orderByAsc(BaseParam::getSortnum);
List<BaseParam> list = baseParamMapper.selectList(baseParamQuery);
if (CollectionUtils.isEmpty(list)){
--
Gitblit v1.9.3