From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/api/RentingApi.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/RentingApi.java b/service-user/src/main/java/com/java110/user/api/RentingApi.java
old mode 100644
new mode 100755
index 01672c8..9b194d7
--- a/service-user/src/main/java/com/java110/user/api/RentingApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingApi.java
@@ -1,15 +1,16 @@
package com.java110.user.api;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.utils.StringUtils;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.rentingConfig.RentingConfigDto;
-import com.java110.dto.rentingPool.RentingPoolDto;
-import com.java110.dto.rentingPoolAttr.RentingPoolAttrDto;
-import com.java110.po.rentingConfig.RentingConfigPo;
-import com.java110.po.rentingPool.RentingPoolPo;
-import com.java110.po.rentingPoolAttr.RentingPoolAttrPo;
-import com.java110.po.rentingPoolFlow.RentingPoolFlowPo;
+import com.java110.dto.renting.RentingConfigDto;
+import com.java110.dto.renting.RentingPoolDto;
+import com.java110.dto.renting.RentingPoolAttrDto;
+import com.java110.po.renting.RentingConfigPo;
+import com.java110.po.renting.RentingPoolPo;
+import com.java110.po.renting.RentingPoolAttrPo;
+import com.java110.po.renting.RentingPoolFlowPo;
import com.java110.user.bmo.rentingConfig.IDeleteRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.IGetRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.ISaveRentingConfigBMO;
@@ -146,11 +147,15 @@
public ResponseEntity<String> queryRentingConfig(
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
- @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId) {
+ @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId,
+ @RequestParam(value = "rentingType",required = false) String rentingType,
+ @RequestParam(value = "rentingFormula",required = false) String rentingFormula) {
RentingConfigDto rentingConfigDto = new RentingConfigDto();
rentingConfigDto.setPage(page);
rentingConfigDto.setRow(row);
rentingConfigDto.setRentingConfigId(rentingConfigId);
+ rentingConfigDto.setRentingType(rentingType);
+ rentingConfigDto.setRentingFormula(rentingFormula);
return getRentingConfigBMOImpl.get(rentingConfigDto);
}
@@ -176,10 +181,16 @@
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingConfigId");
Assert.hasKeyAndValue(reqJson, "ownerName", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerName");
Assert.hasKeyAndValue(reqJson, "ownerTel", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTel");
+ JSONArray photos = null;
+ if (reqJson.containsKey("photos")) {
+ photos = reqJson.getJSONArray("photos");
+ }else{
+ photos = new JSONArray();
+ }
RentingPoolPo rentingPoolPo = BeanConvertUtil.covertBean(reqJson, RentingPoolPo.class);
- return saveRentingPoolBMOImpl.save(rentingPoolPo);
+ return saveRentingPoolBMOImpl.save(rentingPoolPo,photos);
}
/**
@@ -197,8 +208,7 @@
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "price", "璇锋眰鎶ユ枃涓湭鍖呭惈price");
- Assert.hasKeyAndValue(reqJson, "paymentType", "璇锋眰鎶ユ枃涓湭鍖呭惈paymentType");
- Assert.hasKeyAndValue(reqJson, "checkInDate", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
+ Assert.hasKeyAndValue(reqJson, "checkIn", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingConfigId");
Assert.hasKeyAndValue(reqJson, "ownerName", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerName");
Assert.hasKeyAndValue(reqJson, "ownerTel", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTel");
--
Gitblit v1.8.0