From d843fe668c29bd45c986bc915bcdb72a527e2776 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 14 六月 2023 15:09:32 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeApi.java | 45 +++++++++++----------------------------------
1 files changed, 11 insertions(+), 34 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 799cefc..9763f4e 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -171,17 +171,21 @@
* @path /app/feeApi/listOweFees
*/
@RequestMapping(value = "/listOweFees", method = RequestMethod.GET)
- public ResponseEntity<String> listOweFees(
- @RequestParam(value = "payObjId", required = false) String payObjId,
- @RequestParam(value = "payObjType", required = false) String payObjType,
- @RequestParam(value = "ownerId", required = false) String ownerId,
- @RequestParam(value = "communityId") String communityId) {
-
+ public ResponseEntity<String> listOweFees(@RequestParam(value = "payObjId", required = false) String payObjId,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "ownerId", required = false) String ownerId,
+ @RequestParam(value = "communityId") String communityId) {
if (StringUtil.isEmpty(payObjId) && StringUtil.isEmpty(ownerId)) {
throw new IllegalArgumentException("璐圭敤瀵硅薄鎴栬�呬笟涓讳笉鑳介兘涓虹┖");
}
FeeDto feeDto = new FeeDto();
- feeDto.setPayerObjId(payObjId);
+ if(!StringUtil.isEmpty(payObjId)) {
+ if (payObjId.contains(",")) {
+ feeDto.setPayerObjIds(payObjId.split(","));
+ } else {
+ feeDto.setPayerObjId(payObjId);
+ }
+ }
feeDto.setPayerObjType(payObjType);
feeDto.setOwnerId(ownerId);
feeDto.setCommunityId(communityId);
@@ -205,33 +209,6 @@
feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
feeDto.setCommunityId(communityId);
return queryOweFeeImpl.querys(feeDto);
- }
-
- /**
- * 鏌ヨ娆犺垂璐圭敤
- *
- * @param feeId 璐圭敤ID
- * @param communityId 灏忓尯ID
- * @param cycle 鍛ㄦ湡
- * @return
- * @path /app/feeApi/listFeeObj
- */
- @RequestMapping(value = "/listFeeObj", method = RequestMethod.GET)
- public ResponseEntity<String> listFeeObj(
- @RequestParam(value = "feeId") String feeId,
- @RequestParam(value = "cycle", required = false) String cycle,
- @RequestParam(value = "custEndTime", required = false) String custEndTime,
- @RequestParam(value = "communityId") String communityId) {
- FeeDto feeDto = new FeeDto();
- feeDto.setFeeId(feeId);
- feeDto.setCommunityId(communityId);
- if (!StringUtil.isEmpty(cycle)) {
- feeDto.setCycle(cycle);
- }
- if (!StringUtil.isEmpty(custEndTime)) {
- feeDto.setCustEndTime(custEndTime);
- }
- return queryOweFeeImpl.listFeeObj(feeDto);
}
--
Gitblit v1.8.0