From b278a4b743d0cf45fd0b42bc78ff42f4e1124baf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 十月 2021 12:20:04 +0800
Subject: [PATCH] 优化diamante

---
 service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
old mode 100644
new mode 100755
index 84bd4d1..68fa317
--- a/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
+++ b/service-report/src/main/java/com/java110/report/dao/impl/ReportFeeServiceDaoImpl.java
@@ -2,8 +2,11 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.report.ReportFeeDetailDto;
 import com.java110.dto.report.ReportFeeDto;
 import com.java110.report.dao.IReportFeeServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -40,8 +43,32 @@
     public List<ReportFeeDto> getFees(ReportFeeDto reportFeeDto) {
         logger.debug("鏌ヨ璐圭敤淇℃伅 鍏ュ弬 info : {}", JSONObject.toJSONString(reportFeeDto));
 
-        List<ReportFeeDto> roomDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", reportFeeDto);
-
+        //List<ReportFeeDto> roomDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", reportFeeDto);
+        List<Map> roomMaps = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFees", BeanConvertUtil.beanCovertMap(reportFeeDto));
+        List<ReportFeeDto> roomDtos = BeanConvertUtil.covertBeanList(roomMaps,ReportFeeDto.class);
         return roomDtos;
     }
+
+    @Override
+    public List<Map> getFeeConfigs(Map reportFeeDto) {
+        logger.debug("getFeeConfigs 鍏ュ弬 info : {}", JSONObject.toJSONString(reportFeeDto));
+
+        List<Map> feeConfigDtos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFeeConfigs", reportFeeDto);
+
+        return feeConfigDtos;
+    }
+
+    @Override
+    public double getFeeReceivedAmount(ReportFeeDetailDto reportFeeDetailDto) {
+        logger.debug("鏌ヨ瀹炴敹璐圭敤 鍏ュ弬 info : {}", JSONObject.toJSONString(reportFeeDetailDto));
+
+        List<Map> businessReportFeeMonthStatisticsInfos = sqlSessionTemplate.selectList("reportFeeServiceDaoImpl.getFeeReceivedAmount", reportFeeDetailDto);
+        if (businessReportFeeMonthStatisticsInfos.size() < 1) {
+            return 0;
+        }
+
+        Map receivedAmount = businessReportFeeMonthStatisticsInfos.get(0);
+
+        return Double.parseDouble(receivedAmount == null ? "0" : receivedAmount.get("receivedAmount").toString());
+    }
 }

--
Gitblit v1.8.0