From 0c51780582797cc003d59fe483c4e2754b2af577 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 14:33:05 +0800
Subject: [PATCH] 优化公摊
---
service-fee/src/main/java/com/java110/fee/api/FeeApi.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
index cfe70d1..53eb638 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -180,24 +180,60 @@
feeDto.setCommunityId(communityId);
return queryOweFeeImpl.query(feeDto);
}
+ /**
+ * 鏌ヨ娆犺垂璐圭敤
+ *
+ * @param roomId 鎴垮眿ID
+ * @param communityId 灏忓尯ID
+ * @return
+ * @path /app/feeApi/listAllRoomOweFees
+ */
+ @RequestMapping(value = "/listAllRoomOweFees", method = RequestMethod.GET)
+ public ResponseEntity<String> listAllRoomOweFees(
+ @RequestParam(value = "roomId",required = false) String roomId,
+ @RequestParam(value = "communityId") String communityId) {
+ FeeDto feeDto = new FeeDto();
+ feeDto.setPayerObjId(roomId);
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ feeDto.setCommunityId(communityId);
+ return queryOweFeeImpl.querys(feeDto);
+ }
+
+ /**
+ * 鏌ヨ娆犺垂璐圭敤
+ *
+ * @param feeId 璐圭敤ID
+ * @param communityId 灏忓尯ID
+ * @return
+ * @path /app/feeApi/listFeeObj
+ */
+ @RequestMapping(value = "/listFeeObj", method = RequestMethod.GET)
+ public ResponseEntity<String> listFeeObj(
+ @RequestParam(value = "feeId") String feeId,
+ @RequestParam(value = "communityId") String communityId) {
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(feeId);
+ feeDto.setCommunityId(communityId);
+ return queryOweFeeImpl.listFeeObj(feeDto);
+ }
/**
* 鏌ヨ娆犺垂璐圭敤(鎵归噺鏌ヨ)
*
- * @param payObjId 浠樿垂鏂笽D
+ * @param num 鍋滆溅浣嶆垨鎴垮眿缂栧彿
* @param communityId 灏忓尯ID
* @return
* @path /app/feeApi/getOweFees
*/
@RequestMapping(value = "/getOweFees", method = RequestMethod.GET)
public ResponseEntity<String> getOweFees(
- @RequestParam(value = "num",required = false) String num,
@RequestParam(value = "payObjType") String payObjType,
@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "billType") String billType,
@RequestParam(value = "row") int row,
- @RequestParam(value = "page") int page
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "num", required = false) String num
) {
FeeDto feeDto = new FeeDto();
feeDto.setPayerObjId(num);
@@ -253,4 +289,23 @@
return importRoomFeeImpl.importFee(reqJson);
}
+ /**
+ * 杞﹁締璐圭敤瀵煎叆
+ * /feeApi/importCarFees
+ * path /app/feeApi/importCarFees
+ * @param reqString
+ * @return
+ */
+ @RequestMapping(value = "/importCarFees", method = RequestMethod.POST)
+ public ResponseEntity<String> importCarFees(@RequestBody String reqString) {
+
+ JSONObject reqJson = JSONObject.parseObject(reqString);
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
+ Assert.hasKeyAndValue(reqJson, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
+ Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
+ Assert.hasKeyAndValue(reqJson, "userId", "鏈寘鍚敤鎴蜂俊鎭�");
+
+ return importRoomFeeImpl.importCarFee(reqJson);
+ }
+
}
--
Gitblit v1.8.0