From 54e7f06671f70cee10f82576dbe412a14a957084 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 17:25:08 +0800
Subject: [PATCH] 完成巡检 通知员工功能
---
service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 29 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java b/service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java
old mode 100644
new mode 100755
index 2324921..3db8ad7
--- a/service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java
@@ -1,24 +1,20 @@
package com.java110.job.task.fee;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.smo.community.IParkingSpaceInnerServiceSMO;
-import com.java110.core.smo.community.IRoomInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeDetailInnerServiceSMO;
-import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerCarInnerServiceSMO;
-import com.java110.core.smo.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.fee.BillDto;
-import com.java110.dto.fee.BillOweFeeDto;
-import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.fee.FeeDto;
+import com.java110.dto.fee.*;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.task.TaskDto;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.TaskTemplateException;
@@ -28,6 +24,7 @@
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -97,6 +94,10 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(communityDto.getCommunityId());
feeConfigDto.setBillType(getCurTaskAttr(taskDto, TASK_ATTR_BILL_TYPE).getValue());
+
+ if (StringUtil.isEmpty(feeConfigDto.getBillType())) {
+ throw new IllegalArgumentException("閰嶇疆閿欒 鏈嬁鍒板睘鎬у��");
+ }
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
for (FeeConfigDto tmpFeeConfigDto : feeConfigDtos) {
@@ -128,8 +129,8 @@
List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(tmpBillDto);
//Assert.listOnlyOne(billDtos, "褰撳墠瀛樺湪澶氫釜鏈夋晥璐﹀崟" + feeConfigDto.getConfigId());
- if (billDtos != null && billDtos.size() > 1) {
- throw new TaskTemplateException(ResponseConstant.RESULT_CODE_ERROR, "褰撳墠瀛樺湪澶氫釜鏈夋晥璐﹀崟");
+ if (billDtos != null && billDtos.size() > 0) {
+ throw new TaskTemplateException(ResponseConstant.RESULT_CODE_ERROR, "宸茬粡鍑鸿繃璐︿簡");
}
String billId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_billId);
@@ -159,9 +160,15 @@
if (feeDto == null || feeDtos.size() < 1) {
return;
}
-
+ billDto.setReceivable("0");
+ billDto.setReceipts("0");
+ billDto.setCurReceivable("0");
for (FeeDto tmpFeeDto : feeDtos) {
- generateFee(startTime, tmpFeeDto, billDto);
+ try {
+ generateFee(startTime, tmpFeeDto, billDto, feeConfigDto);
+ } catch (Exception e) {
+ logger.error("鐢熸垚璐圭敤澶辫触", e);
+ }
}
@@ -178,7 +185,7 @@
*
* @param feeDto
*/
- private void generateFee(Date startTime, FeeDto feeDto, BillDto billDto) {
+ private void generateFee(Date startTime, FeeDto feeDto, BillDto billDto, FeeConfigDto feeConfigDto) {
Date billEndTime = DateUtil.getCurrentDate();
if ("2009001".equals(feeDto.getState())) { //鍒ゆ柇鏄惁缂磋垂缁撴潫
FeeDetailDto feeDetailDto = new FeeDetailDto();
@@ -201,9 +208,9 @@
return;
}
- if ("3333".equals(feeDto.getPayerObjType())) {
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) {
computeFeePriceByRoom(feeDto);
- } else if ("6666".equals(feeDto.getPayerObjType())) {
+ } else if (FeeDto.PAYER_OBJ_TYPE_PARKING_SPACE.equals(feeDto.getPayerObjType())) {
computeFeePriceByParkingSpace(feeDto);
} else {
return;//杩欎釜娌℃湁娆犺垂鍙畻
@@ -218,14 +225,23 @@
billOweFeeDto.setOweId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_oweId));
billOweFeeDto.setFeeId(feeDto.getFeeId());
billOweFeeDto.setBillId(billDto.getBillId());
-
- int month = dayCompare(startTime, billEndTime);
+ double month = 0.0;
+ if (TASK_ATTR_VALUE_DAY.equals(feeConfigDto.getBillType())) {
+ month = dayCompare(feeDto.getEndTime(), billEndTime);
+ } else {
+ month = monthCompare(feeDto.getEndTime(), billEndTime);
+ }
BigDecimal curFeePrice = new BigDecimal(feeDto.getFeePrice());
curFeePrice = curFeePrice.multiply(new BigDecimal(month));
billOweFeeDto.setAmountOwed(curFeePrice.doubleValue() + "");
- month = dayCompare(feeDto.getEndTime(), billEndTime);
+ if (TASK_ATTR_VALUE_DAY.equals(feeConfigDto.getBillType())) {
+ month = dayCompare(feeDto.getEndTime(), billEndTime);
+ } else {
+ month = monthCompare(feeDto.getEndTime(), billEndTime);
+ }
BigDecimal feePrice = new BigDecimal(feeDto.getFeePrice());
feePrice = feePrice.multiply(new BigDecimal(month));
+
billOweFeeDto.setBillAmountOwed(feePrice.doubleValue() + "");
billOweFeeDto.setFeeEndTime(DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
billOweFeeDto.setCommunityId(feeDto.getCommunityId());
@@ -240,7 +256,7 @@
feeInnerServiceSMOImpl.insertBillOweFees(billOweFeeDto);
- double recFee = StringUtil.isEmpty(billDto.getReceipts()) ? 0.0 : Double.parseDouble(billDto.getReceipts());
+ double recFee = StringUtil.isEmpty(billDto.getReceivable()) ? 0.0 : Double.parseDouble(billDto.getReceivable());
BigDecimal recFeeBig = new BigDecimal(recFee);
BigDecimal newRecFee = recFeeBig.add(feePrice);
@@ -289,7 +305,7 @@
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) {
//杞︿綅鍙兘琚垹闄や簡
- billOweFeeDto.setOweId("1");
+ billOweFeeDto.setOwnerId("1");
billOweFeeDto.setOwnerName("鏈煡");
billOweFeeDto.setOwnerTel("19999999999");
billOweFeeDto.setPayerObjName("鏈煡");
@@ -309,13 +325,13 @@
if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
//鎴垮眿鍙兘琚垹闄や簡
- billOweFeeDto.setOweId("1");
+ billOweFeeDto.setOwnerId("1");
billOweFeeDto.setOwnerName("鏈煡");
billOweFeeDto.setOwnerTel("19999999999");
return;
}
- billOweFeeDto.setOweId(ownerCarDtos.get(0).getOwnerId());
+ billOweFeeDto.setOwnerId(ownerCarDtos.get(0).getOwnerId());
billOweFeeDto.setOwnerName(ownerCarDtos.get(0).getOwnerName());
billOweFeeDto.setOwnerTel(ownerCarDtos.get(0).getLink());
}
@@ -343,8 +359,13 @@
RoomDto tmpRoomDto = roomDtos.get(0);
- billOweFeeDto.setPayerObjName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
+ //billOweFeeDto.setPayerObjName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
+ if (RoomDto.ROOM_TYPE_ROOM.equals(tmpRoomDto.getRoomType())) {
+ billOweFeeDto.setPayerObjName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getUnitNum() + "鍗曞厓" + tmpRoomDto.getRoomNum() + "瀹�");
+ } else {
+ billOweFeeDto.setPayerObjName(tmpRoomDto.getFloorNum() + "鏍�" + tmpRoomDto.getRoomNum() + "瀹�");
+ }
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setByOwnerInfo(true);
ownerRoomRelDto.setRoomId(tmpRoomDto.getRoomId());
@@ -358,7 +379,7 @@
return;
}
- billOweFeeDto.setOweId(ownerRoomRelDtos.get(0).getOwnerId());
+ billOweFeeDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
billOweFeeDto.setOwnerName(ownerRoomRelDtos.get(0).getOwnerName());
billOweFeeDto.setOwnerTel(ownerRoomRelDtos.get(0).getLink());
@@ -416,11 +437,23 @@
} else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("3003".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
+ BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDto.getRoomArea()));
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
+ feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("1101".equals(computingFormula)) { // 绉熼噾
+ BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(roomDto.getRoomRent()));
+ feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
} else {
feePrice = -1.00;
}
feeDto.setFeePrice(feePrice);
+
+ //鏌ヨ涓氫富淇℃伅
+
+
}
/**
@@ -448,6 +481,10 @@
} else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
feePrice = additionalAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ } else if ("3003".equals(computingFormula)) { // 鍥哄畾璐圭敤
+ feePrice = 0;
+ } else if ("1101".equals(computingFormula)) { // 绉熼噾
+ feePrice = 0;
} else {
feePrice = -1.00;
}
@@ -466,7 +503,7 @@
* @param toDate
* @return
*/
- public static int dayCompare(Date fromDate, Date toDate) {
+ public static int monthCompare(Date fromDate, Date toDate) {
Calendar from = Calendar.getInstance();
from.setTime(fromDate);
Calendar to = Calendar.getInstance();
@@ -479,4 +516,31 @@
int month = toYear * 12 + toMonth - (fromYear * 12 + fromMonth);
return month;
}
+
+ /**
+ * 璁＄畻2涓棩鏈熶箣闂寸浉宸殑 浠ュ勾銆佹湀銆佹棩涓哄崟浣嶏紝鍚勮嚜璁＄畻缁撴灉鏄灏�
+ * 姣斿锛�2011-02-02 鍒� 2017-03-02
+ * 浠ュ勾涓哄崟浣嶇浉宸负锛�6骞�
+ * 浠ユ湀涓哄崟浣嶇浉宸负锛�73涓湀
+ * 浠ユ棩涓哄崟浣嶇浉宸负锛�2220澶�
+ *
+ * @param fromDate
+ * @param toDate
+ * @return
+ */
+ public static double dayCompare(Date fromDate, Date toDate) {
+ Calendar from = Calendar.getInstance();
+ from.setTime(fromDate);
+ Calendar to = Calendar.getInstance();
+ to.setTime(toDate);
+
+ long t1 = from.getTimeInMillis();
+ long t2 = to.getTimeInMillis();
+ double days = (t2 - t1) * 1.00 / (24 * 60 * 60 * 1000);
+
+ BigDecimal tmpDays = new BigDecimal(days);
+ BigDecimal monthDay = new BigDecimal(30);
+
+ return tmpDays.divide(monthDay, 2, RoundingMode.HALF_UP).doubleValue();
+ }
}
--
Gitblit v1.8.0