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'
---
java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java
index 304f87e..8604c7f 100644
--- a/java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/fee/IFeeInnerServiceSMO.java
@@ -1,5 +1,6 @@
package com.java110.intf.fee;
+import com.alibaba.fastjson.JSONArray;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.fee.BillDto;
import com.java110.dto.fee.BillOweFeeDto;
@@ -42,7 +43,6 @@
*/
@RequestMapping(value = "/queryBusinessFees", method = RequestMethod.POST)
List<FeeDto> queryBusinessFees(@RequestBody FeeDto feeDto);
-
/**
@@ -93,6 +93,45 @@
@RequestMapping(value = "/queryBills", method = RequestMethod.POST)
public List<BillDto> queryBills(@RequestBody BillDto billDto);
+
+ /**
+ * 鏌ヨ璐﹀崟娆犺垂
+ *
+ * @param feeDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+ */
+ @RequestMapping(value = "/computeBillOweFeeCount", method = RequestMethod.POST)
+ public int computeBillOweFeeCount(@RequestBody FeeDto feeDto);
+
+ /**
+ * 鏌ヨ璐﹀崟娆犺垂
+ *
+ * @param feeDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+ */
+ @RequestMapping(value = "/computeEveryOweFee", method = RequestMethod.POST)
+ public List<FeeDto> computeEveryOweFee(@RequestBody FeeDto feeDto);
+
+
+ /**
+ * 鏌ヨ璐﹀崟娆犺垂
+ *
+ * @param feeDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+ */
+ @RequestMapping(value = "/computeEveryOweFeeCount", method = RequestMethod.POST)
+ public int computeEveryOweFeeCount(@RequestBody FeeDto feeDto);
+
+ /**
+ * 鏌ヨ璐﹀崟娆犺垂
+ *
+ * @param feeDto 鏁版嵁瀵硅薄鍒嗕韩
+ * @return 灏忓尯涓嬬殑灏忓尯妤艰褰曟暟
+ */
+ @RequestMapping(value = "/computeBillOweFee", method = RequestMethod.POST)
+ public List<FeeDto> computeBillOweFee(@RequestBody FeeDto feeDto);
+
+
/**
* 鏌ヨ 娆犺垂鏁伴噺
*
@@ -118,7 +157,17 @@
* @return
*/
@RequestMapping(value = "/insertBillOweFees", method = RequestMethod.POST)
- public int insertBillOweFees(@RequestBody BillOweFeeDto billDto) ;
+ public int insertBillOweFees(@RequestBody BillOweFeeDto billDto);
+
+ /**
+ * 淇濆瓨娆犺垂
+ *
+ * @param billDto
+ * @return
+ */
+ @RequestMapping(value = "/updateBillOweFees", method = RequestMethod.POST)
+ public int updateBillOweFees(@RequestBody BillOweFeeDto billDto);
+
/**
* 淇濆瓨璐﹀崟
*
@@ -131,4 +180,11 @@
@RequestMapping(value = "/updateFee", method = RequestMethod.POST)
public int updateFee(@RequestBody PayFeePo payFeePo);
+
+ @RequestMapping(value = "/saveFee", method = RequestMethod.POST)
+ int saveFee(@RequestBody List<PayFeePo> payFeePos);
+
+
+ @RequestMapping(value = "/getAssetsFee", method = RequestMethod.POST)
+ public JSONArray getAssetsFee(@RequestBody String communityId);
}
--
Gitblit v1.8.0