From 17a004b47eb77af0a9b2cce4e797a59e17d4add6 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 23 十月 2023 16:39:11 +0800
Subject: [PATCH] # 到处字段调整 配置数据启用逻辑 价格配置文案调整
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 1 -
server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java | 6 +++---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java | 21 +++++++++++++++++++--
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
index 3912cdc..7a81e97 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -34,14 +34,14 @@
private String rentLockId;
@ApiModelProperty(value = "楠戣鏃堕暱")
- @ExcelColumn(name="楠戣鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鍊熷嚭鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Integer rideTime;
@ApiModelProperty(value = "璁¤垂鏃堕暱")
// @ExcelColumn(name="璁¤垂鏃堕暱",index = 8,width = 10,align = HorizontalAlignment.CENTER)
private Integer duration;
@ApiModelProperty(value = "鍊熷嚭鏃堕棿")
- @ExcelColumn(name="鍊熷嚭鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鍊熷嚭鏃堕棿",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date rentDate;
@ApiModelProperty(value = "杩樿溅绔欑偣")
@@ -53,6 +53,6 @@
private String backLockId;
@ApiModelProperty(value = "杩樿溅鏃堕棿")
- @ExcelColumn(name="杩樿溅鏃堕棿",index = 14,width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="褰掕繕鏃堕棿",index = 14,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date backDate;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index a95c173..0c6eb9d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -116,7 +116,6 @@
MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
- .leftJoin(Bikes.class,Bikes::getCode,BikeRepair::getBinkeId)
.leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
queryWrapper.selectAll(BikeRepair.class)
.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
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 4cbd243..300ce2f 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
@@ -104,8 +104,8 @@
if(min >0){
title += min+"鍒嗛挓";
}
- title += Constants.translateMoney(unitPrice).doubleValue()
- +"鍏冿紝瓒呰繃鍚�"+basePrice.doubleValue()+"鍏�/"
+ title += basePrice.doubleValue()
+ +"鍏冿紝瓒呰繃鍚�"+unitPrice.doubleValue()+"鍏�/"
+unitTime+"鍒嗛挓";
}
return title;
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 fac671c..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