From 43119e9cac4750e2dddb2e19c2c5e2eb46ae05ca Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 14:04:36 +0800
Subject: [PATCH] 修復bug
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 349f663..781768b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -273,7 +273,7 @@
throw new BusinessException( ResponseStatus.DATA_EMPTY );
}
if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
- Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
+ Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ZERO){
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
}
if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index f05ef39..d3c549d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -212,10 +212,13 @@
queryWrapper.lambda().like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Sites::getCode,pageWrap.getModel().getName());
queryWrapper.lambda().orderByAsc(Sites::getCode);
IPage<Sites> sitesMonitorDTO = sitesMapper.selectPage(page, queryWrapper);
-
if (!CollectionUtils.isEmpty(sitesMonitorDTO.getRecords())){
sitesMonitorDTO.getRecords().forEach(s->{
- s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),BigDecimal.ROUND_UP).setScale(2));
+ if(Constants.formatIntegerNum(s.getAllLockNum()) >0){
+ s.setRate(new BigDecimal(s.getBikeCount()).divide(new BigDecimal(s.getAllLockNum()),BigDecimal.ROUND_UP).setScale(2));
+ }else{
+ s.setRate(new BigDecimal(0.0));
+ }
});
}
--
Gitblit v1.9.3