From 634cea842c9a4f2ef1bddde07d7b5a334f0117de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 11:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 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
index 7307b37..76c12b9 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -2,7 +2,9 @@
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.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.ISaveFeeReceiptBMO;
@@ -11,6 +13,7 @@
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;
@@ -18,6 +21,8 @@
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")
@@ -42,6 +47,9 @@
@Autowired
private IGetFeeReceiptDetailBMO getFeeReceiptDetailBMOImpl;
+
+ @Autowired
+ private IStoreInnerServiceSMO storeInnerServiceSMO;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -113,15 +121,59 @@
*/
@RequestMapping(value = "/queryFeeReceipt", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceipt(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "receiptId",required = false) String receiptId,
+ @RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "receiptId", required = false) String receiptId,
@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);
+ feeReceiptDto.setObjType(objType);
+ feeReceiptDto.setObjName(roomId);
+ feeReceiptDto.setStoreName(storeName);
return getFeeReceiptBMOImpl.get(feeReceiptDto);
+ }
+
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /feeReceipt/queryFeeReceipt
+ * @path /app/feeReceipt/queryFeeReceipt
+ */
+ @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 = "page") int page,
+ @RequestParam(value = "row") int row) {
+ FeeReceiptDtoNew feeReceiptDto = new FeeReceiptDtoNew();
+ feeReceiptDto.setPage(page);
+ feeReceiptDto.setRow(row);
+ feeReceiptDto.setCommunityId(communityId);
+ feeReceiptDto.setType(type);
+ feeReceiptDto.setQstartTime(qstartTime);
+ feeReceiptDto.setQendTime(qendTime);
+ feeReceiptDto.setObjType(objType);
+ feeReceiptDto.setObjName(roomName);
+ return getFeeReceiptBMOImpl.gets(feeReceiptDto);
}
/**
@@ -194,7 +246,7 @@
*/
@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 = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -204,4 +256,5 @@
feeReceiptDetailDto.setReceiptId(receiptId);
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
+
}
--
Gitblit v1.8.0