From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 39 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..25b76a0 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
@@ -53,13 +53,23 @@
@Override
public String create(PricingDetail pricingDetail) {
+ //鏍￠獙鍙傛暟鍚堟硶鎬�
checkPricingDetail(pricingDetail);
+
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ UpdateWrapper<PricingDetail> wrapper = new UpdateWrapper<>();
+ wrapper.lambda()
+ .set(PricingDetail::getIsdeleted,Constants.ONE)
+ .set(PricingDetail::getEditDate,new Date())
+ .set(PricingDetail::getEditor,principal.getId())
+ .eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
+ .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId());
+ pricingDetailMapper.update(null, wrapper);//鍒犻櫎鑰佺殑閰嶇疆
+
PricingDetail insert = new PricingDetail();
+ insert.setId(Constants.getUUID());
insert.setCreateDate(new Date());
insert.setCreator(principal.getId());
- insert.setEditDate(new Date());
- insert.setEditor(principal.getId());
insert.setIsdeleted(Constants.ZERO);
insert.setPricePramId(pricingDetail.getPricePramId());
insert.setBikeTypeId(pricingDetail.getBikeTypeId());
@@ -72,48 +82,58 @@
insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
insert.setInfo(pricingDetail.getInfo());
- insert.setTitle(pricingDetail.getTitle());
- pricingDetailMapper.insert(pricingDetail);
+ 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);
return pricingDetail.getId();
}
+ public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
+ String title = "璁¤垂瑙勫垯锛�";
+ if(baseTime < 0){
+ title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ }else {
+ title += "璧锋";
+ int time = baseTime / 60;
+ int min = baseTime % 60;
+ if(time > 0){
+ title += time+"灏忔椂";
+ }
+ if(min >0){
+ title += min+"鍒嗛挓";
+ }
+ title += basePrice.divide(new BigDecimal(100)).doubleValue()
+ +"鍏冿紝瓒呰繃鍚�"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"鍏�/"
+ +unitTime+"鍒嗛挓";
+ }
+ return title;
+ }
+
private void checkPricingDetail(PricingDetail pricingDetail){
- if ((Objects.nonNull(pricingDetail.getBaseTime()) && pricingDetail.getBaseTime() < 0) &&
- Objects.isNull(pricingDetail.getBasePrice())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
+ if(StringUtils.isBlank(pricingDetail.getPricePramId())
+ ||StringUtils.isBlank(pricingDetail.getBikeTypeId())
+ ||pricingDetail.getBaseTime() == null
+ ||pricingDetail.getBaseTime()==0
+ ||Constants.formatDecimalNum(pricingDetail.getBasePrice() ).doubleValue()<0
+ ||Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice() ).doubleValue()<0
+ ||pricingDetail.getHolidayBaseTime() == null
+ || pricingDetail.getHolidayBaseTime()==0){
+ //鍙傛暟閿欒
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- if ((Objects.nonNull(pricingDetail.getBaseTime()) && pricingDetail.getBaseTime() > 0) &&
- (Objects.isNull(pricingDetail.getBasePrice())
- || Objects.isNull(pricingDetail.getUnitTime())
- || Objects.isNull(pricingDetail.getUnitPrice()))){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
+ 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);
}
-
- if ( (Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() < 0)
- && ( Objects.isNull(pricingDetail.getHolidayBasePrice()))
- ){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
+ if ( pricingDetail.getHolidayBaseTime() < 0){
+ pricingDetail.setHolidayBaseTime(-1);
}
-
- if (((Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() > 0))
- && (Objects.isNull(pricingDetail.getHolidayBasePrice())
- || Objects.isNull(pricingDetail.getHolidayUnitTime())
- || Objects.isNull(pricingDetail.getHolidayUnitPrice()))){
-
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
- }
-
- QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(PricingDetail::getIsdeleted,Constants.ZERO)
- .eq(PricingDetail::getBikeTypeId,pricingDetail.getBikeTypeId())
- .eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId());
- Integer exitCount = pricingDetailMapper.selectCount(wrapper);
-
- if (exitCount > Constants.ZERO){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅鍨嬪凡閰嶇疆");
- }
+// PricingDetail exitCount = pricingDetailMapper.selectOne(wrapper);
}
@@ -190,8 +210,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 +232,13 @@
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.setSortnum(s.getSortnum());
+ 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