From 7d14164d6eb63881290e8cdffb00b16bf3dc51a9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 10:43:07 +0800
Subject: [PATCH] #订单默认获取已支付的
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 170 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 133 insertions(+), 37 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 17168b5..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
@@ -7,10 +7,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.BaseParamMapper;
import com.doumee.dao.business.PricingDetailMapper;
import com.doumee.dao.business.join.PricingDetailJoinMapper;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.PricingDetail;
+import com.doumee.service.business.BaseParamService;
import com.doumee.service.business.PricingDetailService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -18,14 +20,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import sun.text.resources.et.CollationData_et;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 瀹氫环鏂规鏄庣粏閰嶇疆Service瀹炵幇
@@ -41,32 +46,14 @@
@Autowired
PricingDetailJoinMapper pricingDetailJoinMapper;
+ @Autowired
+ BaseParamMapper baseParamMapper;
+
+
@Override
public String create(PricingDetail pricingDetail) {
- if ((pricingDetail.getBaseTime() < 0) &&
- Objects.isNull(pricingDetail.getBasePrice())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
- }
-
- if ((pricingDetail.getBaseTime() > 0) &&
- (Objects.isNull(pricingDetail.getBasePrice())
- || Objects.isNull(pricingDetail.getUnitTime())
- || Objects.isNull(pricingDetail.getUnitPrice()))){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
- }
-
- if ((pricingDetail.getHolidayBasePrice() < 0) &&
- Objects.isNull(pricingDetail.getBasePrice()) ){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
- }
-
- if ((pricingDetail.getHolidayBasePrice() > 0) &&
- (Objects.isNull(pricingDetail.getHolidayBasePrice())
- || Objects.isNull(pricingDetail.getHolidayBasePrice())
- || Objects.isNull(pricingDetail.getHolidayBasePrice()))){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
- }
+ checkPricingDetail(pricingDetail);
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
PricingDetail insert = new PricingDetail();
insert.setCreateDate(new Date());
@@ -77,17 +64,58 @@
insert.setPricePramId(pricingDetail.getPricePramId());
insert.setBikeTypeId(pricingDetail.getBikeTypeId());
insert.setBaseTime(pricingDetail.getBaseTime());
- insert.setBasePrice(pricingDetail.getBasePrice());
insert.setUnitTime(pricingDetail.getUnitTime());
- insert.setUnitPrice(pricingDetail.getUnitPrice());
insert.setHolidayBaseTime(pricingDetail.getHolidayBaseTime());
- insert.setHolidayBasePrice(pricingDetail.getHolidayBasePrice());
insert.setHolidayUnitTime(pricingDetail.getHolidayUnitTime());
- insert.setHolidayUnitPrice(pricingDetail.getHolidayUnitPrice());
+ insert.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
+ insert.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
+ 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);
+ pricingDetailMapper.insert(insert);
return pricingDetail.getId();
+ }
+
+ 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 ((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(),"闃舵瀹氫环鍙傛暟涓嶅彲涓虹┖");
+ }
+
+ if ( (Objects.nonNull(pricingDetail.getHolidayBaseTime()) && pricingDetail.getHolidayBaseTime() < 0)
+ && ( Objects.isNull(pricingDetail.getHolidayBasePrice()))
+ ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鑺傚亣涓�鍙ｄ环浠锋牸涓嶅彲涓虹┖");
+ }
+
+ 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())
+ .last("limit 1");
+ PricingDetail exitCount = pricingDetailMapper.selectOne(wrapper);
+
+ if (Objects.nonNull(exitCount) && !Objects.equals(exitCount.getId(),pricingDetail.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅鍨嬪凡閰嶇疆");
+ }
+
}
@Override
@@ -111,6 +139,15 @@
@Override
public void updateById(PricingDetail pricingDetail) {
+ checkPricingDetail(pricingDetail);
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pricingDetail.setEditDate(new Date());
+ pricingDetail.setEditor(principal.getId());
+ pricingDetail.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
+ pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
+
pricingDetailMapper.updateById(pricingDetail);
}
@@ -126,23 +163,73 @@
@Override
public PricingDetail findById(String id) {
- return pricingDetailMapper.selectById(id);
+ PricingDetail model = pricingDetailMapper.selectById(id);
+ if(model !=null ){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ return model;
}
@Override
public PricingDetail findOne(PricingDetail pricingDetail) {
QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
- return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
+ PricingDetail model = pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
+ if(model !=null ){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ return model;
}
@Override
public List<PricingDetail> findList(PricingDetail pricingDetail) {
MPJLambdaWrapper<PricingDetail> wrapper = new MPJLambdaWrapper<>();
- wrapper.leftJoin(BaseParam.class,BaseParam::getId,PricingDetail::getBikeTypeId)
- .eq(BaseParam::getType,Constants.THREE);
+ wrapper.eq(PricingDetail::getPricePramId,pricingDetail.getPricePramId())
+ .eq(PricingDetail::getIsdeleted,Constants.ZERO);
+ wrapper.rightJoin(BaseParam.class,BaseParam::getId,PricingDetail::getBikeTypeId);
wrapper.selectAll(PricingDetail.class)
+ .selectAs(BaseParam::getId,PricingDetail::getBikeTypeId)
.selectAs(BaseParam::getName,PricingDetail::getBikeTypeName);
- return pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
+ 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)))
+ .orElse(new HashMap<>());
+ QueryWrapper<BaseParam> baseParamQuery = new QueryWrapper();
+ baseParamQuery.lambda()
+ .eq(BaseParam::getIsdeleted,Constants.ZERO)
+ .eq(BaseParam::getType,Constants.THREE)
+ .orderByAsc(BaseParam::getSortnum);
+ List<BaseParam> list = baseParamMapper.selectList(baseParamQuery);
+ if (CollectionUtils.isEmpty(list)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍐呯疆鏁版嵁纭疄");
+ }
+
+ 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){
+// for(PricingDetail model :result){
+// model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+// model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+// model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+// model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+// }
+// }
+ return collect;
}
@Override
@@ -213,7 +300,16 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(pricingDetailMapper.selectPage(page, queryWrapper));
+ IPage<PricingDetail> result =pricingDetailMapper.selectPage(page, queryWrapper);
+ if(result.getRecords()!= null ){
+ for(PricingDetail model : result.getRecords()){
+ model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
+ model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
+ model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
+ model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
+ }
+ }
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3