From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
old mode 100644
new mode 100755
index 75f1ebe..a5eb935
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -1,14 +1,15 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.dto.importData.ImportFeeDto;
+import com.java110.dto.importData.ImportFeeDetailDto;
+import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.ISaveImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IUpdateImportFeeDetailBMO;
-import com.java110.po.importFeeDetail.ImportFeeDetailPo;
+import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,13 +34,16 @@
@Autowired
private IGetImportFeeBMO getImportFeeBMOImpl;
+ @Autowired
+ private IFeeSharingBMO feeSharingBMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
* @param reqJson
* @return
- * @serviceCode /importFeeDetail/saveImportFeeDetail
- * @path /app/importFeeDetail/saveImportFeeDetail
+ * @serviceCode /importFee/saveImportFeeDetail
+ * @path /app/importFee/saveImportFeeDetail
*/
@RequestMapping(value = "/saveImportFeeDetail", method = RequestMethod.POST)
public ResponseEntity<String> saveImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -56,8 +60,8 @@
*
* @param reqJson
* @return
- * @serviceCode /importFeeDetail/updateImportFeeDetail
- * @path /app/importFeeDetail/updateImportFeeDetail
+ * @serviceCode /importFee/updateImportFeeDetail
+ * @path /app/importFee/updateImportFeeDetail
*/
@RequestMapping(value = "/updateImportFeeDetail", method = RequestMethod.POST)
public ResponseEntity<String> updateImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -75,8 +79,8 @@
*
* @param reqJson
* @return
- * @serviceCode /importFeeDetail/deleteImportFeeDetail
- * @path /app/importFeeDetail/deleteImportFeeDetail
+ * @serviceCode /importFee/deleteImportFeeDetail
+ * @path /app/importFee/deleteImportFeeDetail
*/
@RequestMapping(value = "/deleteImportFeeDetail", method = RequestMethod.POST)
public ResponseEntity<String> deleteImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -94,17 +98,27 @@
*
* @param communityId 灏忓尯ID
* @return
- * @serviceCode /importFeeDetail/queryImportFeeDetail
- * @path /app/importFeeDetail/queryImportFeeDetail
+ * @serviceCode /importFee/queryImportFeeDetail
+ * @path /app/importFee/queryImportFeeDetail
*/
@RequestMapping(value = "/queryImportFeeDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryImportFeeDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "importFeeId", required = false) String importFeeId) {
ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
importFeeDetailDto.setPage(page);
importFeeDetailDto.setRow(row);
importFeeDetailDto.setCommunityId(communityId);
+ importFeeDetailDto.setImportFeeId(importFeeId);
+ importFeeDetailDto.setFloorNum(floorNum);
+ importFeeDetailDto.setUnitNum(unitNum);
+ importFeeDetailDto.setRoomNum(roomNum);
+ importFeeDetailDto.setFeeId(feeId);
return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
}
@@ -114,17 +128,51 @@
*
* @param communityId 灏忓尯ID
* @return
- * @serviceCode /importFeeDetail/queryImportFeeDetail
+ * @serviceCode /importFee/queryImportFee
* @path /app/importFee/queryImportFee
*/
@RequestMapping(value = "/queryImportFee", method = RequestMethod.GET)
public ResponseEntity<String> queryImportFee(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "importFeeId", required = false) String importFeeId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+
+ @RequestParam(value = "row") int row) {
ImportFeeDto importFeeDto = new ImportFeeDto();
importFeeDto.setPage(page);
importFeeDto.setRow(row);
+ importFeeDto.setImportFeeId(importFeeId);
+ importFeeDto.setFeeTypeCd(feeTypeCd);
importFeeDto.setCommunityId(communityId);
return getImportFeeBMOImpl.get(importFeeDto);
}
+
+ /**
+ * 璐圭敤鍏憡
+ *
+ * @param reqJson 鍏憡淇℃伅
+ * @return
+ * @serviceCode /importFee/feeSharing
+ * @path /app/importFee/feeSharing
+ */
+ @RequestMapping(value = "/feeSharing", method = RequestMethod.POST)
+ public ResponseEntity<String> feeSharing(@RequestBody String reqJson,
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId) {
+ JSONObject reqObj = JSONObject.parseObject(reqJson);
+ Assert.hasKeyAndValue(reqObj, "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.hasKeyAndValue(reqObj, "totalDegrees", "鏈寘鍚娇鐢ㄩ噺");
+ Assert.hasKeyAndValue(reqObj, "scope", "鏈寘鍚叕鎽婅寖鍥�");
+ Assert.hasKeyAndValue(reqObj, "formulaId", "鏈寘鍚叕鎽婂叕寮�");
+ Assert.hasKeyAndValue(reqObj, "feeName", "鏈寘鍚垂鐢ㄥ悕绉�");
+ Assert.hasKeyAndValue(reqObj, "startTime", "鏈寘鍚紑濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqObj, "endTime", "鏈寘鍚粨鏉熸椂闂�");
+ Assert.hasKeyAndValue(reqObj, "objId", "鏈寘鍚叕鎽婂璞�");
+ Assert.hasKeyAndValue(reqObj, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
+ Assert.hasKeyAndValue(reqObj, "roomType", "鏈寘鍚埧灞嬬被鍨�");
+ reqObj.put("storeId", storeId);
+ reqObj.put("userId", userId);
+
+ return feeSharingBMOImpl.share(reqObj);
+ }
}
--
Gitblit v1.8.0