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 |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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 b86862a..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();
     }
 
     /**
@@ -179,6 +179,24 @@
         feeDto.setPayerObjType(payObjType);
         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);
     }
 
     /**
@@ -290,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