From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
old mode 100644
new mode 100755
index 90b5746..827d549
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeReceipt.FeeReceiptDto;
import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
-import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
+import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
@@ -125,8 +125,12 @@
@RequestParam(value = "objType", required = false) String objType,
@RequestParam(value = "objId", required = false) String objId,
@RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "payObjId", required = false) String payObjId,
@RequestParam(value = "receiptId", required = false) String receiptId,
@RequestParam(value = "receiptIds", required = false) String receiptIds,
+ @RequestParam(value = "detailIds", required = false) String detailIds,
+ @RequestParam(value = "qstartTime", required = false) String qstartTime,
+ @RequestParam(value = "qendTime", required = false) String qendTime,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
@RequestHeader(value = "user_id") String userId) {
@@ -146,10 +150,20 @@
if (!StringUtil.isEmpty(receiptIds)) {
feeReceiptDto.setReceiptIds(receiptIds.split(","));
}
+ if (!StringUtil.isEmpty(detailIds)) {
+ feeReceiptDto.setDetailIds(detailIds.split(","));
+ }
feeReceiptDto.setObjType(objType);
feeReceiptDto.setObjName(roomId);
feeReceiptDto.setObjId(objId);
feeReceiptDto.setStoreName(storeName);
+ feeReceiptDto.setPayObjId(payObjId);
+ if (!StringUtil.isEmpty(qstartTime)) {
+ feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(qendTime)) {
+ feeReceiptDto.setQendTime(qendTime + " 23:59:59");
+ }
return getFeeReceiptBMOImpl.get(feeReceiptDto);
}
@@ -159,8 +173,8 @@
*
* @param communityId 灏忓尯ID
* @return
- * @serviceCode /feeReceipt/queryFeeReceipt
- * @path /app/feeReceipt/queryFeeReceipt
+ * @serviceCode /feeReceipt/queryFeeReceiptNew
+ * @path /app/feeReceipt/queryFeeReceiptNew
*/
@RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
@@ -255,6 +269,7 @@
public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "receiptId", required = false) String receiptId,
@RequestParam(value = "receiptIds", required = false) String receiptIds,
+ @RequestParam(value = "detailIds", required = false) String detailIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -265,6 +280,9 @@
if (!StringUtil.isEmpty(receiptIds)) {
feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
}
+ if (!StringUtil.isEmpty(detailIds)) {
+ feeReceiptDetailDto.setDetailIds(detailIds.split(","));
+ }
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
--
Gitblit v1.8.0