From c6d20c6e1db82b204cf59e058bc3ba2a9cd84a1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 09:24:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
index e196d52..53664f0 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java
@@ -7,8 +7,10 @@
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.PricingParamMapper;
+import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.PricingDetail;
import com.doumee.dao.business.model.PricingParam;
import com.doumee.service.business.PricingParamService;
@@ -24,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 瀹氫环鏂规閰嶇疆Service瀹炵幇
@@ -38,6 +41,9 @@
@Autowired
private PricingDetailMapper pricingDetailMapper;
+
+ @Autowired
+ private BaseParamMapper baseParamMapper;
@Override
public String create(PricingParam pricingParam) {
@@ -102,10 +108,21 @@
wrapper.lambda()
.eq(PricingDetail::getIsdeleted,Constants.ZERO)
.eq(PricingDetail::getPricePramId,pricingParam.getId());
- Integer integer = pricingDetailMapper.selectCount(wrapper);
- if (integer < 0 ){
+ List<PricingDetail> pricingDetails = pricingDetailMapper.selectList(wrapper);
+ QueryWrapper<BaseParam> baseParamQuery = new QueryWrapper<>();
+ baseParamQuery.lambda()
+ .eq(BaseParam::getIsdeleted,Constants.ZERO)
+ .eq(BaseParam::getType,Constants.THREE);
+ List<BaseParam> baseParams = baseParamMapper.selectList(baseParamQuery);
+ if (CollectionUtils.isEmpty(pricingDetails)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ畾浠锋柟妗堜笅娌℃湁閰嶇疆浠锋牸");
}
+ List<String> collect = pricingDetails.stream().map(s -> s.getBikeTypeId()).collect(Collectors.toList());
+ boolean b = baseParams.stream().map(s -> s.getId()).anyMatch(s -> collect.contains(s));
+
+ if (b){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ畾浠锋柟妗堜笅娌℃湁閰嶇疆瀹屾暣");
+ }
PricingParam pricingParam1 = new PricingParam();
pricingParam1.setId(pricingParam.getId());
pricingParam1.setStatus(pricingParam.getStatus());
--
Gitblit v1.9.3