From 0aa7c7fcb8b3516ef421e2da4106b5f768d1daa7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 08:56:55 +0800
Subject: [PATCH] #获取可退款信息
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 e22580f..559d288 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
@@ -73,7 +73,7 @@
insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
insert.setInfo(pricingDetail.getInfo());
insert.setTitle(pricingDetail.getTitle());
- pricingDetailMapper.insert(pricingDetail);
+ pricingDetailMapper.insert(insert);
return pricingDetail.getId();
}
@@ -108,10 +108,11 @@
wrapper.lambda()
.eq(PricingDetail::getIsdeleted,Constants.ZERO)
.eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
- .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId());
- Integer exitCount = pricingDetailMapper.selectCount(wrapper);
+ .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId())
+ .last("limit 1");
+ PricingDetail exitCount = pricingDetailMapper.selectOne(wrapper);
- if (exitCount > Constants.ZERO){
+ if (Objects.nonNull(exitCount) && !Objects.equals(exitCount.getId(),pricingDetail.getId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅鍨嬪凡閰嶇疆");
}
@@ -190,8 +191,11 @@
MPJLambdaWrapper<PricingDetail> wrapper = new MPJLambdaWrapper<>();
wrapper.eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId())
.eq(PricingDetail::getIsdeleted,Constants.ZERO);
- wrapper.selectAll(PricingDetail.class);
- List<PricingDetail> result = pricingDetailMapper.selectList(wrapper);
+ wrapper.rightJoin(BaseParam.class,BaseParam::getId,PricingDetail::getBikeTypeId);
+ wrapper.selectAll(PricingDetail.class)
+ .selectAs(BaseParam::getId,PricingDetail::getBikeTypeId)
+ .selectAs(BaseParam::getName,PricingDetail::getBikeTypeName);
+ List<PricingDetail> result = pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
Map<String, PricingDetail> stringPricingDetailMap = Optional.ofNullable(result)
.map(s -> s.stream().collect(Collectors.toMap(p -> p.getBikeTypeId(), p -> p)))
@@ -209,7 +213,12 @@
List<PricingDetail> collect = list.stream().map(s -> {
PricingDetail put = stringPricingDetailMap.getOrDefault(s.getId(), new PricingDetail());
put.setBikeTypeId(s.getId());
+ put.setPricePramId(pricingDetail.getPricePramId());
put.setBikeTypeName(s.getName());
+ put.setBasePrice(Objects.nonNull(put.getBasePrice()) ? Constants.translateMoney(put.getBasePrice()) : null);
+ put.setHolidayBasePrice(Objects.nonNull(put.getHolidayBasePrice()) ? Constants.translateMoney(put.getHolidayBasePrice()):null);
+ put.setUnitPrice(Objects.nonNull(put.getUnitPrice()) ? Constants.translateMoney(put.getUnitPrice()):null);
+ put.setHolidayUnitPrice(Objects.nonNull(put.getHolidayUnitPrice()) ? Constants.translateMoney(put.getHolidayUnitPrice()):null);
return put;
}).collect(Collectors.toList());
// if(result!=null){
--
Gitblit v1.9.3