From df3192f4e98377526d098928a9910c03e836c630 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 22:02:36 +0800
Subject: [PATCH] 优化戴拿
---
service-fee/src/main/java/com/java110/fee/api/FeeApi.java | 122 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 13 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
old mode 100644
new mode 100755
index d86d911..33b5b15
--- a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -6,11 +6,7 @@
import com.java110.core.factory.DataTransactionFactory;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.fee.bmo.IImportRoomFee;
-import com.java110.fee.bmo.IPayOweFee;
-import com.java110.fee.bmo.IQueryFeeByAttr;
-import com.java110.fee.bmo.IQueryOweFee;
-import com.java110.fee.bmo.IQueryParkspaceFee;
+import com.java110.fee.bmo.*;
import com.java110.fee.smo.IFeeServiceSMO;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.InitConfigDataException;
@@ -20,11 +16,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -91,8 +83,8 @@
responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
null);
} finally {
- return responseJson.toJSONString();
}
+ return responseJson.toJSONString();
}
/**
@@ -188,6 +180,70 @@
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 num 鍋滆溅浣嶆垨鎴垮眿缂栧彿
+ * @param communityId 灏忓尯ID
+ * @return
+ * @path /app/feeApi/getOweFees
+ */
+ @RequestMapping(value = "/getOweFees", method = RequestMethod.GET)
+ public ResponseEntity<String> getOweFees(
+ @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 = "num", required = false) String num
+ ) {
+ FeeDto feeDto = new FeeDto();
+ feeDto.setPayerObjId(num);
+ feeDto.setPayerObjType(payObjType);
+ feeDto.setCommunityId(communityId);
+ feeDto.setBillType(billType);
+ feeDto.setRow(row);
+ feeDto.setPage(page);
+ return queryOweFeeImpl.queryAllOwneFee(feeDto);
+ }
/**
* 娆犺垂鎵归噺缂磋垂
@@ -218,11 +274,13 @@
/**
* 璐圭敤瀵煎叆
*
- * @param reqJson
+ * @param reqString
* @return
*/
@RequestMapping(value = "/importRoomFees", method = RequestMethod.POST)
- public ResponseEntity<String> importRoomFees(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> importRoomFees(@RequestBody String reqString) {
+
+ JSONObject reqJson = JSONObject.parseObject(reqString);
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
Assert.hasKeyAndValue(reqJson, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
@@ -231,4 +289,42 @@
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);
+ }
+
+ /**
+ * 鍚堝悓璐圭敤瀵煎叆
+ * /feeApi/importContractFees
+ * path /app/feeApi/importContractFees
+ * @param reqString
+ * @return
+ */
+ @RequestMapping(value = "/importContractFees", method = RequestMethod.POST)
+ public ResponseEntity<String> importContractFees(@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.importContractFees(reqJson);
+ }
+
}
--
Gitblit v1.8.0