From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/api/FeeApi.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 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 53eb638..c6cfbcd
--- a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -12,8 +12,9 @@
 import com.java110.utils.exception.InitConfigDataException;
 import com.java110.utils.exception.InitDataFlowContextException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -83,8 +84,8 @@
             responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
                     null);
         } finally {
-            return responseJson.toJSONString();
         }
+        return responseJson.toJSONString();
     }
 
     /**
@@ -180,17 +181,18 @@
         feeDto.setCommunityId(communityId);
         return queryOweFeeImpl.query(feeDto);
     }
+
     /**
      * 鏌ヨ娆犺垂璐圭敤
      *
-     * @param roomId    鎴垮眿ID
+     * @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 = "roomId", required = false) String roomId,
             @RequestParam(value = "communityId") String communityId) {
         FeeDto feeDto = new FeeDto();
         feeDto.setPayerObjId(roomId);
@@ -204,16 +206,21 @@
      *
      * @param feeId       璐圭敤ID
      * @param communityId 灏忓尯ID
+     * @param cycle       鍛ㄦ湡
      * @return
      * @path /app/feeApi/listFeeObj
      */
     @RequestMapping(value = "/listFeeObj", method = RequestMethod.GET)
     public ResponseEntity<String> listFeeObj(
             @RequestParam(value = "feeId") String feeId,
+            @RequestParam(value = "cycle", required = false) String cycle,
             @RequestParam(value = "communityId") String communityId) {
         FeeDto feeDto = new FeeDto();
         feeDto.setFeeId(feeId);
         feeDto.setCommunityId(communityId);
+        if (!StringUtil.isEmpty(cycle)) {
+            feeDto.setCycle(cycle);
+        }
         return queryOweFeeImpl.listFeeObj(feeDto);
     }
 
@@ -285,6 +292,7 @@
         Assert.hasKeyAndValue(reqJson, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
         Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
         Assert.hasKeyAndValue(reqJson, "userId", "鏈寘鍚敤鎴蜂俊鎭�");
+        Assert.hasKeyAndValue(reqJson, "batchId", "鏈寘鍚敤鎴蜂俊鎭�");
 
         return importRoomFeeImpl.importFee(reqJson);
     }
@@ -293,6 +301,7 @@
      * 杞﹁締璐圭敤瀵煎叆
      * /feeApi/importCarFees
      * path /app/feeApi/importCarFees
+     *
      * @param reqString
      * @return
      */
@@ -304,8 +313,30 @@
         Assert.hasKeyAndValue(reqJson, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
         Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
         Assert.hasKeyAndValue(reqJson, "userId", "鏈寘鍚敤鎴蜂俊鎭�");
+        Assert.hasKeyAndValue(reqJson, "batchId", "鏈寘鍚壒娆′俊鎭�");
 
         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", "鏈寘鍚敤鎴蜂俊鎭�");
+        Assert.hasKeyAndValue(reqJson, "batchId", "鏈寘鍚壒娆′俊鎭�");
+
+        return importRoomFeeImpl.importContractFees(reqJson);
+    }
+
 }

--
Gitblit v1.8.0