优化催缴单 单价 有很多0 的问题

service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -23,6 +23,7 @@ import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.ListenerExecuteException;
 import com.java110.utils.util.*;
 import com.java110.vo.ResultVo;
+import com.java110.vo.api.feeConfig.ApiFeeConfigDataVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -92,6 +93,13 @@ public class QueryOweFeeImpl implements IQueryOweFee {
         List<FeeDto> tmpFeeDtos = new ArrayList<>();
         for (FeeDto tmpFeeDto : feeDtos) {
             try {
+                if (!StringUtil.isEmpty(tmpFeeDto.getAdditionalAmount())) {
+                    tmpFeeDto.setAdditionalAmount(Double.parseDouble(tmpFeeDto.getAdditionalAmount()) + "");
+                }
+                if (!StringUtil.isEmpty(tmpFeeDto.getSquarePrice())) {
+                    tmpFeeDto.setSquarePrice(Double.parseDouble(tmpFeeDto.getSquarePrice()) + "");
+                }
+
                 //todo 有目标结束时间,并且不是一次性费用
                 if (!StringUtil.isEmpty(feeDto.getTargetEndTime())
                         && !FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())
@@ -182,7 +190,7 @@ public class QueryOweFeeImpl implements IQueryOweFee {
                 throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
             }
             roomDto = roomDtos.get(0);
-            feeDto.setPayerObjName(roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + roomDto.getRoomNum() );
+            feeDto.setPayerObjName(roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + roomDto.getRoomNum());
             feeDto.setBuiltUpArea(roomDto.getBuiltUpArea());
 
         } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//车位相关

service-fee/src/main/java/com/java110/fee/dao/impl/FeeServiceDaoImpl.java

@@ -54,9 +54,9 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
 
         logger.debug("查询费用信息 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.getBusinessFeeInfo", info);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.getBusinessFeeInfo", info);
 
-        return businessFeeInfos;
+        return infos;
     }
 
 
@@ -89,9 +89,9 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public List<Map> getFeeInfo(Map info) throws DAOException {
         logger.debug("查询费用信息 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.getFeeInfo", info);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.getFeeInfo", info);
 
-        return businessFeeInfos;
+        return infos;
     }
 
 
@@ -122,33 +122,33 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public int queryFeesCount(Map info) {
         logger.debug("查询费用数据 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeesCount", info);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeesCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public int queryFeeByAttrCount(Map info) {
         logger.debug("查询费用数据 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeeByAttrCount", info);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeeByAttrCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> queryFeeByAttr(Map info) throws DAOException {
         logger.debug("查询费用信息 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeeByAttr", info);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryFeeByAttr", info);
 
-        return businessFeeInfos;
+        return infos;
     }
 
     /**
@@ -161,12 +161,12 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public int queryBillCount(Map info) {
         logger.debug("查询费用数据 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillCount", info);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
 
@@ -181,9 +181,9 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public List<Map> queryBills(Map info) throws DAOException {
         logger.debug("查询费用信息 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBills", info);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBills", info);
 
-        return businessFeeInfos;
+        return infos;
     }
 
 
@@ -197,12 +197,12 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public int queryBillOweFeeCount(Map info) {
         logger.debug("查询费用数据 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillOweFeeCount", info);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillOweFeeCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
 
@@ -217,9 +217,9 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
     public List<Map> queryBillOweFees(Map info) throws DAOException {
         logger.debug("查询费用信息 入参 info : {}", info);
 
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillOweFees", info);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.queryBillOweFees", info);
 
-        return businessFeeInfos;
+        return infos;
     }
 
 
@@ -289,34 +289,34 @@ public class FeeServiceDaoImpl extends BaseServiceDao implements IFeeServiceDao
 
     @Override
     public int computeBillOweFeeCount(Map beanCovertMap) {
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeBillOweFeeCount", beanCovertMap);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeBillOweFeeCount", beanCovertMap);
+        if (infos.size() < 1) {
             return 0;
         }
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> computeBillOweFee(Map beanCovertMap) {
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeBillOweFee", beanCovertMap);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeBillOweFee", beanCovertMap);
 
-        return businessFeeInfos;
+        return infos;
     }
 
     @Override
     public int computeEveryOweFeeCount(Map beanCovertMap) {
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeEveryOweFeeCount", beanCovertMap);
-        if (businessFeeInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeEveryOweFeeCount", beanCovertMap);
+        if (infos.size() < 1) {
             return 0;
         }
-        return Integer.parseInt(businessFeeInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> computeEveryOweFee(Map beanCovertMap) {
-        List<Map> businessFeeInfos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeEveryOweFee", beanCovertMap);
+        List<Map> infos = sqlSessionTemplate.selectList("feeServiceDaoImpl.computeEveryOweFee", beanCovertMap);
 
-        return businessFeeInfos;
+        return infos;
     }
 
     @Override