From bb4825f57b22b841c5eb6db4d72447e6036b3c9b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 08 十一月 2022 11:02:47 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
index 114bcf9..d26abf0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseRegisterServiceImpl.java
@@ -181,9 +181,9 @@
}
private void checkDepositMoney(RentingHouseRegisterDTO registerDTO) {
- BigDecimal depositMoney = registerDTO.getDepositMoney();
+ BigDecimal dingMoney = registerDTO.getDingMoney();
BigDecimal monthlyRentMoney = registerDTO.getMonthlyRentMoney();
- if (nonNull(depositMoney) && nonNull(monthlyRentMoney) && depositMoney.compareTo(monthlyRentMoney) == 1) {
+ if (nonNull(dingMoney) && nonNull(monthlyRentMoney) && dingMoney.compareTo(monthlyRentMoney) == 1) {
throw new ServiceException("500", "定金不能超过月租金");
}
}
@@ -427,7 +427,7 @@
public R nearby(NearbyDTO nearbyDTO) {
Rectangle rectangle =new NearbyUtil().getRectangle(nearbyDTO.getDistance(), Double.parseDouble(nearbyDTO.getLongitude()), Double.parseDouble(nearbyDTO.getLatitude()));
return R.ok(this.baseMapper.nearby(rectangle.getMinX(),rectangle.getMaxX(),
- rectangle.getMinY(),rectangle.getMaxY(),nearbyDTO.getKeyword(), nearbyDTO.getCommunityId()));
+ rectangle.getMinY(),rectangle.getMaxY(), nearbyDTO));
}
@Override
@@ -439,7 +439,7 @@
}
@Override
- public void updateAllHouseUnionAppCode() {
+ public void updateAllHouseUnionAppCode(String areaCode) {
List<RentingHourseRegister> list = this.baseMapper.selectList(null);
if (!list.isEmpty()) {
list.stream().forEach(houseRegister -> {
--
Gitblit v1.7.1