From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 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 b17868e..403c34c
--- 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,8 @@
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;
import com.java110.fee.bmo.feeReceipt.ISaveFeeReceiptBMO;
@@ -12,13 +13,17 @@
import com.java110.fee.bmo.feeReceiptDetail.IGetFeeReceiptDetailBMO;
import com.java110.fee.bmo.feeReceiptDetail.ISaveFeeReceiptDetailBMO;
import com.java110.fee.bmo.feeReceiptDetail.IUpdateFeeReceiptDetailBMO;
+import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.po.feeReceipt.FeeReceiptPo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping(value = "/feeReceipt")
@@ -43,6 +48,9 @@
@Autowired
private IGetFeeReceiptDetailBMO getFeeReceiptDetailBMOImpl;
+
+ @Autowired
+ private IStoreInnerServiceSMO storeInnerServiceSMO;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -114,18 +122,36 @@
*/
@RequestMapping(value = "/queryFeeReceipt", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceipt(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "objType",required = false) String objType,
- @RequestParam(value = "roomId",required = false) String roomId,
- @RequestParam(value = "receiptId",required = false) String receiptId,
+ @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 = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "row") int row,
+ @RequestHeader(value = "user_id") String userId) {
+ //鑾峰彇鍟嗘埛鍚嶇О
+ StoreUserDto storeUserDto = new StoreUserDto();
+ storeUserDto.setUserId(userId);
+ List<StoreUserDto> storeUserDtos = storeInnerServiceSMO.getStoreUserInfo(storeUserDto);
+ String storeName = "";
+ for (StoreUserDto storeUser : storeUserDtos) {
+ storeName = storeUser.getName();
+ }
FeeReceiptDto feeReceiptDto = new FeeReceiptDto();
feeReceiptDto.setPage(page);
feeReceiptDto.setRow(row);
feeReceiptDto.setCommunityId(communityId);
feeReceiptDto.setReceiptId(receiptId);
+ if (!StringUtil.isEmpty(receiptIds)) {
+ feeReceiptDto.setReceiptIds(receiptIds.split(","));
+ }
feeReceiptDto.setObjType(objType);
feeReceiptDto.setObjName(roomId);
+ feeReceiptDto.setObjId(objId);
+ feeReceiptDto.setStoreName(storeName);
+ feeReceiptDto.setPayObjId(payObjId);
return getFeeReceiptBMOImpl.get(feeReceiptDto);
}
@@ -140,14 +166,13 @@
*/
@RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "objType",required = false) String objType,
- @RequestParam(value = "roomName",required = false) String roomName,
- @RequestParam(value = "type",required = false) String type,
- @RequestParam(value = "qstartTime",required = false) String qstartTime,
- @RequestParam(value = "qendTime",required = false) String qendTime,
+ @RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "roomName", required = false) String roomName,
+ @RequestParam(value = "type", required = false) String type,
+ @RequestParam(value = "qstartTime", required = false) String qstartTime,
+ @RequestParam(value = "qendTime", required = false) String qendTime,
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ @RequestParam(value = "row") int row) {
FeeReceiptDtoNew feeReceiptDto = new FeeReceiptDtoNew();
feeReceiptDto.setPage(page);
feeReceiptDto.setRow(row);
@@ -156,9 +181,10 @@
feeReceiptDto.setQstartTime(qstartTime);
feeReceiptDto.setQendTime(qendTime);
feeReceiptDto.setObjType(objType);
- feeReceiptDto.setObjName(roomName );
+ feeReceiptDto.setObjName(roomName);
return getFeeReceiptBMOImpl.gets(feeReceiptDto);
}
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -229,7 +255,8 @@
*/
@RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "receiptId",required = false) String receiptId,
+ @RequestParam(value = "receiptId", required = false) String receiptId,
+ @RequestParam(value = "receiptIds", required = false) String receiptIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -237,6 +264,9 @@
feeReceiptDetailDto.setRow(row);
feeReceiptDetailDto.setCommunityId(communityId);
feeReceiptDetailDto.setReceiptId(receiptId);
+ if (!StringUtil.isEmpty(receiptIds)) {
+ feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
+ }
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
--
Gitblit v1.8.0