From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeApi.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 bc154ff..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
@@ -83,8 +83,8 @@
responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
null);
} finally {
- return responseJson.toJSONString();
}
+ return responseJson.toJSONString();
}
/**
@@ -191,7 +191,6 @@
@RequestMapping(value = "/listAllRoomOweFees", method = RequestMethod.GET)
public ResponseEntity<String> listAllRoomOweFees(
@RequestParam(value = "roomId",required = false) String roomId,
- @RequestParam(value = "payObjType") String payObjType,
@RequestParam(value = "communityId") String communityId) {
FeeDto feeDto = new FeeDto();
feeDto.setPayerObjId(roomId);
@@ -309,4 +308,23 @@
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