From a18887bf0bae1e775f7e331917449f66519c9a12 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 21 二月 2025 09:02:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 ea23ebc..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
@@ -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