From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈

---
 service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
old mode 100644
new mode 100755
index ee8d82e..76a5bef
--- a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
@@ -3,20 +3,28 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
 import com.java110.fee.bmo.feeDiscount.IDeleteFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscount.ISaveFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscount.IUpdateFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
+import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
 import com.java110.fee.bmo.feeDiscountRuleSpec.IGetFeeDiscountRuleSpecBMO;
 import com.java110.po.feeDiscount.FeeDiscountPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+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 java.text.ParseException;
 
 
 @RestController
@@ -38,6 +46,9 @@
 
     @Autowired
     private IGetFeeDiscountRuleSpecBMO getFeeDiscountRuleSpecBMOImpl;
+
+    @Autowired
+    private IComputeFeeDiscountBMO computeFeeDiscountBMOImpl;
 
     /**
      * 寰俊淇濆瓨娑堟伅妯℃澘
@@ -157,4 +168,46 @@
         feeDiscountRuleSpecDto.setRuleId(ruleId);
         return getFeeDiscountRuleSpecBMOImpl.get(feeDiscountRuleSpecDto);
     }
+
+    /**
+     * 璁$畻璐圭敤鎶樻墸
+     *
+     * @param communityId 灏忓尯ID
+     * @return
+     * @serviceCode /feeDiscount/computeFeeDiscount
+     * @path /app/feeDiscount/computeFeeDiscount
+     */
+    @RequestMapping(value = "/computeFeeDiscount", method = RequestMethod.GET)
+    public ResponseEntity<String> computeFeeDiscount(@RequestParam(value = "feeId") String feeId,
+                                                     @RequestParam(value = "communityId") String communityId,
+                                                     @RequestParam(value = "cycles") double cycles,
+                                                     @RequestParam(value = "payerObjId") String payerObjId,
+                                                     @RequestParam(value = "payerObjType") String payerObjType,
+                                                     @RequestParam(value = "endTime") String endTime,
+                                                     @RequestParam(value = "page") int page,
+                                                     @RequestParam(value = "row") int row) throws ParseException {
+        return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, payerObjId, payerObjType, endTime, page, row);
+    }
+
+
+    /**
+     * 鏌ヨ 缂磋垂浼樻儬
+     *
+     * @return
+     * @serviceCode /feeDiscount/queryFeeDetailDiscount
+     * @path /app/feeDiscount/queryFeeDetailDiscount
+     */
+    @RequestMapping(value = "/queryFeeDetailDiscount", method = RequestMethod.GET)
+    public ResponseEntity<String> queryFeeDetailDiscount(
+            @RequestParam(value = "detailId") String detailId,
+            @RequestParam(value = "communityId") String communityId,
+            @RequestParam(value = "page") int page,
+            @RequestParam(value = "row") int row) {
+        PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+        payFeeDetailDiscountDto.setPage(page);
+        payFeeDetailDiscountDto.setRow(row);
+        payFeeDetailDiscountDto.setDetailId(detailId);
+        payFeeDetailDiscountDto.setCommunityId(communityId);
+        return getFeeDiscountBMOImpl.getFeeDetailDiscount(payFeeDetailDiscountDto);
+    }
 }

--
Gitblit v1.8.0