From b82dc768e1155831744ea228bead3464a379ff5d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 21 八月 2020 20:10:11 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 161 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index 413808c..2951db4 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -1,6 +1,7 @@
package com.java110.fee.bmo.impl;
import com.java110.dto.RoomDto;
+import com.java110.dto.fee.BillDto;
import com.java110.dto.fee.BillOweFeeDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
@@ -10,6 +11,8 @@
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -35,23 +38,166 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
@Override
public ResponseEntity<String> query(FeeDto feeDto) {
- //鏌ヨ璐圭敤淇℃伅
+ //鏌ヨ璐圭敤淇℃伅arrearsEndTime
+ feeDto.setArrearsEndTime(DateUtil.getCurrentDate());
+ feeDto.setState(FeeDto.STATE_DOING);
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
if (feeDtos == null || feeDtos.size() < 1) {
feeDtos = new ArrayList<>();
return ResultVo.createResponseEntity(feeDtos);
}
-
+ List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
computeOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
+
+ //濡傛灉閲戦涓�0 灏辨帓闄�
+ if (tmpFeeDto.getFeePrice() > 0) {
+ tmpFeeDtos.add(tmpFeeDto);
+ }
}
- return ResultVo.createResponseEntity(feeDtos);
+
+ return ResultVo.createResponseEntity(tmpFeeDtos);
+ }
+
+ @Override
+ public ResponseEntity<String> queryAllOwneFee(FeeDto feeDto) {
+ ResponseEntity<String> responseEntity = null;
+ if (FeeConfigDto.BILL_TYPE_EVERY.equals(feeDto.getBillType())) {
+ responseEntity = computeEveryOweFee(feeDto);
+ } else {
+ responseEntity = computeBillOweFee(feeDto);
+ }
+ return responseEntity;
+ }
+
+ /**
+ * 璐﹀崟璐圭敤
+ *
+ * @param feeDto
+ * @return
+ */
+ private ResponseEntity<String> computeBillOweFee(FeeDto feeDto) {
+ int count = feeInnerServiceSMOImpl.computeBillOweFeeCount(feeDto);
+ List<FeeDto> feeDtos = null;
+ if (count > 0) {
+ feeDtos = feeInnerServiceSMOImpl.computeBillOweFee(feeDto);
+ } else {
+ feeDtos = new ArrayList<>();
+ }
+ return ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) feeDto.getRow()), count, feeDtos);
+ }
+
+ /**
+ * 瀹炴椂璐圭敤
+ *
+ * @param feeDto
+ * @return
+ */
+ private ResponseEntity<String> computeEveryOweFee(FeeDto feeDto) {
+
+ int count = feeInnerServiceSMOImpl.computeEveryOweFeeCount(feeDto);
+ List<FeeDto> feeDtos = null;
+ if (count > 0) {
+ feeDtos = feeInnerServiceSMOImpl.computeEveryOweFee(feeDto);
+ computeFeePrices(feeDtos);
+
+ } else {
+ feeDtos = new ArrayList<>();
+ }
+ return ResultVo.createResponseEntity((int) Math.ceil((double) count / (double) feeDto.getRow()), count, feeDtos);
+ }
+
+ private void computeFeePrices(List<FeeDto> feeDtos) {
+
+ List<FeeDto> roomFees = new ArrayList<>();
+ List<FeeDto> psFees = new ArrayList<>();
+ List<String> roomIds = new ArrayList<>();
+ List<String> psIds = new ArrayList<>();
+
+ for (FeeDto fee : feeDtos) {
+ if ("3333".equals(fee.getPayerObjType())) { //鎴垮眿鐩稿叧
+ roomFees.add(fee);
+ roomIds.add(fee.getPayerObjId());
+ } else if ("6666".equals(fee.getPayerObjType())) {//杞︿綅鐩稿叧
+ psFees.add(fee);
+ psIds.add(fee.getPayerObjId());
+ }
+ }
+
+ if (roomFees.size() > 0) {
+ computeRoomFee(roomFees, roomIds);
+ }
+
+ if (roomFees.size() > 0) {
+ computePsFee(psFees, psIds);
+ }
+ }
+
+ /**
+ * 璁＄畻鍋滆溅璐�
+ *
+ * @param psFees
+ */
+ private void computePsFee(List<FeeDto> psFees, List<String> psIds) {
+ }
+
+ /**
+ * 璁＄畻鎴垮眿璐�
+ *
+ * @param roomFees
+ */
+ private void computeRoomFee(List<FeeDto> roomFees, List<String> roomIds) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(roomFees.get(0).getCommunityId());
+ roomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ if (roomDtos == null || roomDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
+ return;
+ }
+
+ for (RoomDto tmpRoomDto : roomDtos) {
+ for (FeeDto feeDto : roomFees) {
+ dealFeeRoom(tmpRoomDto, feeDto);
+ }
+ }
+
+
+ }
+
+ private void dealFeeRoom(RoomDto tmpRoomDto, FeeDto feeDto) {
+
+ if (!tmpRoomDto.getRoomId().equals(feeDto.getPayerObjId())) {
+ return;
+ }
+ feeDto.setRoomName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
+
+ String computingFormula = feeDto.getComputingFormula();
+ double feePrice = 0.00;
+ if ("1001".equals(computingFormula)) { //闈㈢Н*鍗曚环+闄勫姞璐�
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(tmpRoomDto.getBuiltUpArea()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("4004".equals(computingFormula)) {
+ feePrice = Double.parseDouble(feeDto.getAmount());
+ } else {
+ feePrice = 0.00;
+ }
+ feeDto.setFeePrice(feePrice);
+
}
/**
@@ -66,10 +212,20 @@
computeFeePrice(tmpFeeDto);
return;
}
+ BillDto billDto = new BillDto();
+ billDto.setCommunityId(tmpFeeDto.getCommunityId());
+ billDto.setConfigId(tmpFeeDto.getConfigId());
+ billDto.setCurBill("T");
+ List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(billDto);
+ if (billDtos == null || billDtos.size() < 1) {
+ tmpFeeDto.setFeePrice(0.00);
+ return;
+ }
BillOweFeeDto billOweFeeDto = new BillOweFeeDto();
billOweFeeDto.setCommunityId(tmpFeeDto.getCommunityId());
billOweFeeDto.setFeeId(tmpFeeDto.getFeeId());
- billOweFeeDto.setState("T");
+ billOweFeeDto.setState(BillOweFeeDto.STATE_WILL_FEE);
+ billOweFeeDto.setBillId(billDtos.get(0).getBillId());
List<BillOweFeeDto> billOweFeeDtos = feeInnerServiceSMOImpl.queryBillOweFees(billOweFeeDto);
if (billOweFeeDtos == null || billOweFeeDtos.size() < 1) {
tmpFeeDto.setFeePrice(0.00);
@@ -152,6 +308,7 @@
feePrice = 0.00;
}
+
feeDto.setFeePrice(feePrice);
}
--
Gitblit v1.8.0