From 6543cd42661e2f55b28bdc354022a57885d549de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 09:19:49 +0800
Subject: [PATCH] 优化公摊问题
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 285 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 154 insertions(+), 131 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 50773ec..b99f8ac 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,9 +1,9 @@
package com.java110.fee.bmo.impl;
import com.alibaba.fastjson.JSONArray;
+import com.java110.core.factory.Java110ThreadPoolFactory;
+import com.java110.core.smo.IComputeFeeSMO;
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;
import com.java110.dto.owner.OwnerCarDto;
@@ -16,6 +16,10 @@
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.ListenerExecuteException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -27,8 +31,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
public class QueryOweFeeImpl implements IQueryOweFee {
@@ -55,6 +63,17 @@
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+ @Autowired
+ private IComputeFeeSMO computeFeeSMOImpl;
+
+ //鍩�
+ public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+ //閿�
+ public static final String TOTAL_FEE_PRICE = "TOTAL_FEE_PRICE";
+
+ //閿�
+ public static final String RECEIVED_AMOUNT_SWITCH = "RECEIVED_AMOUNT_SWITCH";
@Override
public ResponseEntity<String> query(FeeDto feeDto) {
@@ -70,10 +89,9 @@
}
List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
- computeOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
-
+ computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
//濡傛灉閲戦涓�0 灏辨帓闄�
- if (tmpFeeDto.getFeePrice() > 0) {
+ if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
tmpFeeDtos.add(tmpFeeDto);
}
}
@@ -96,6 +114,134 @@
responseEntity = computeBillOweFee(feeDto);
}
return responseEntity;
+ }
+
+ @Override
+ public ResponseEntity<String> listFeeObj(FeeDto feeDto) {
+
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return ResultVo.success();
+ }
+
+ feeDto = feeDtos.get(0);
+
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(feeDto.getPayerObjId());
+ roomDto.setCommunityId(feeDto.getCommunityId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (roomDtos == null || roomDtos.size() != 1) {
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒版埧灞嬩俊鎭紝鏌ヨ澶氭潯鏁版嵁");
+ }
+ roomDto = roomDtos.get(0);
+ feeDto.setPayerObjName(roomDto.getFloorNum() + "鏍�" + roomDto.getUnitNum() + "鍗曞厓" + roomDto.getRoomNum() + "瀹�");
+ feeDto.setBuiltUpArea(roomDto.getBuiltUpArea());
+
+ } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCommunityId(feeDto.getCommunityId());
+ ownerCarDto.setCarId(feeDto.getPayerObjId());
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+ Assert.listOnlyOne(ownerCarDtos, "鏈壘鍒拌溅杈嗕俊鎭�");
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
+ parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
+ throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒板仠杞︿綅淇℃伅锛屾煡璇㈠鏉℃暟鎹�");
+ }
+ ownerCarDto = ownerCarDtos.get(0);
+ parkingSpaceDto = parkingSpaceDtos.get(0);
+ feeDto.setPayerObjName(ownerCarDto.getCarNum() + "(" + parkingSpaceDto.getAreaNum() + "鍋滆溅鍦�" + parkingSpaceDto.getNum() + "杞︿綅)");
+ feeDto.setBuiltUpArea(parkingSpaceDto.getArea());
+ }
+ double feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
+ feeDto.setFeePrice(feePrice);
+ //搴旀敹娆惧彇鍊�
+ String val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ feeDto.setVal(val);
+ String received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+ if (StringUtil.isEmpty(received_amount_switch)) {
+ feeDto.setReceivedAmountSwitch("1");//榛樿鍚敤瀹炴敹娆捐緭鍏ユ
+ } else {
+ feeDto.setReceivedAmountSwitch(received_amount_switch);
+ }
+ return ResultVo.createResponseEntity(feeDto);
+ }
+
+ @Override
+ public ResponseEntity<String> querys(FeeDto feeDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(feeDto.getCommunityId());
+ roomDto.setRoomId(feeDto.getPayerObjId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ if (roomDtos == null || roomDtos.size() < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛", new JSONArray());
+ }
+ //鏌ヨ璐圭敤淇℃伅arrearsEndTime
+ List<RoomDto> tmpRoomDtos = new ArrayList<>();
+ List<RoomDto> tempRooms = new ArrayList<>();
+ int threadNum = Java110ThreadPoolFactory.JAVA110_DEFAULT_THREAD_NUM;
+
+ tempRooms.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
+ for(RoomDto tmpRoomDto:tempRooms){
+ if(tmpRoomDto == null){
+ continue;
+ }
+ tmpRoomDtos.add(tmpRoomDto);
+ }
+
+ return ResultVo.createResponseEntity(tmpRoomDtos);
+ }
+
+ private List<RoomDto> doGetTmpRoomDto(List<RoomDto> roomDtos, FeeDto feeDto, int threadNum) {
+ Java110ThreadPoolFactory java110ThreadPoolFactory = null;
+ try {
+ java110ThreadPoolFactory = Java110ThreadPoolFactory.getInstance().createThreadPool(threadNum);
+ for (RoomDto roomDto1 : roomDtos) {
+ java110ThreadPoolFactory.submit(() -> {
+ return getTmpRoomDtos(roomDto1, feeDto);
+ });
+ }
+ return java110ThreadPoolFactory.get();
+ } finally {
+ if (java110ThreadPoolFactory != null) {
+ java110ThreadPoolFactory.stop();
+ }
+ }
+ }
+
+ private RoomDto getTmpRoomDtos(RoomDto tmpRoomDto, FeeDto feeDto) {
+ FeeDto tmpFeeDto = null;
+ tmpFeeDto = new FeeDto();
+ tmpFeeDto.setArrearsEndTime(DateUtil.getCurrentDate());
+ tmpFeeDto.setState(FeeDto.STATE_DOING);
+ tmpFeeDto.setPayerObjId(tmpRoomDto.getRoomId());
+ tmpFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.querySimpleFees(tmpFeeDto);
+
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return null;
+ }
+
+ List<FeeDto> tmpFeeDtos = new ArrayList<>();
+ for (FeeDto tempFeeDto : feeDtos) {
+
+ computeFeeSMOImpl.computeEveryOweFee(tempFeeDto, tmpRoomDto);//璁＄畻娆犺垂閲戦
+ //濡傛灉閲戦涓�0 灏辨帓闄�
+ if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+ tmpFeeDtos.add(tempFeeDto);
+ }
+ }
+
+ if (tmpFeeDtos.size() < 1) {
+ return null;
+ }
+ tmpRoomDto.setFees(tmpFeeDtos);
+ return tmpRoomDto;
}
private boolean freshFeeDtoParam(FeeDto feeDto) {
@@ -392,129 +538,6 @@
}
- /**
- * 璁＄畻娆犺垂閲戦
- *
- * @param tmpFeeDto
- */
- private void computeOweFee(FeeDto tmpFeeDto) {
- String billType = tmpFeeDto.getBillType();
-
- if (FeeConfigDto.BILL_TYPE_EVERY.equals(billType)) {
- 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(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);
- return;
- }
- try {
- tmpFeeDto.setDeadlineTime(DateUtil.getDateFromString(billOweFeeDtos.get(0).getDeadlineTime(), DateUtil.DATE_FORMATE_STRING_A));
- } catch (ParseException e) {
- logger.error("鑾峰彇缁撴潫鏃堕棿澶辫触", e);
- }
- tmpFeeDto.setFeePrice(Double.parseDouble(billOweFeeDtos.get(0).getAmountOwed()));
- }
-
-
- private void computeFeePrice(FeeDto feeDto) {
-
- if ("3333".equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
- computeFeePriceByRoom(feeDto);
- } else if ("6666".equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
- computeFeePriceByParkingSpace(feeDto);
- }
- }
-
- private void computeFeePriceByParkingSpace(FeeDto feeDto) {
-
- ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
- parkingSpaceDto.setPsId(feeDto.getPayerObjId());
- List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
-
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
- return;
- }
-
- 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(parkingSpaceDtos.get(0).getArea()));
- 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);
- double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
- BigDecimal price = new BigDecimal(feeDto.getFeePrice());
- price = price.multiply(new BigDecimal(month));
- feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
-
-
- }
-
- /**
- * 鏍规嵁鎴垮眿鏉ョ畻鍗曚环
- *
- * @param feeDto
- */
- private void computeFeePriceByRoom(FeeDto feeDto) {
- RoomDto roomDto = new RoomDto();
- roomDto.setCommunityId(feeDto.getCommunityId());
- roomDto.setRoomId(feeDto.getPayerObjId());
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
-
- if (roomDtos == null || roomDtos.size() < 1) { //鏁版嵁鏈夐棶棰�
- return;
- }
-
- 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(roomDtos.get(0).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);
- double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
- BigDecimal price = new BigDecimal(feeDto.getFeePrice());
- price = price.multiply(new BigDecimal(month));
- feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }
-
/**
* 璁＄畻2涓棩鏈熶箣闂寸浉宸殑 浠ュ勾銆佹湀銆佹棩涓哄崟浣嶏紝鍚勮嚜璁＄畻缁撴灉鏄灏�
@@ -535,7 +558,7 @@
long t1 = from.getTimeInMillis();
long t2 = to.getTimeInMillis();
- long days = (t2 - t1) / (24 * 60 * 60 * 1000);
+ double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
BigDecimal tmpDays = new BigDecimal(days);
BigDecimal monthDay = new BigDecimal(30);
--
Gitblit v1.8.0