From 32cb7fc6cf7801ab4b5db99636d448557a014a55 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 24 六月 2020 18:27:13 +0800
Subject: [PATCH] 出账
---
service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java | 90 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 15 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
index 7e0902e..252c29d 100644
--- 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,13 +1,13 @@
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.owner.IOwnerCarInnerServiceSMO;
-import com.java110.core.smo.owner.IOwnerRoomRelInnerServiceSMO;
-import com.java110.core.smo.parkingSpace.IParkingSpaceInnerServiceSMO;
-import com.java110.core.smo.room.IRoomInnerServiceSMO;
+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;
@@ -74,6 +74,8 @@
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+
@Override
protected void process(TaskDto taskDto) throws Exception {
@@ -118,12 +120,13 @@
*/
private void GenerateBillByFeeConfig(TaskDto taskDto, FeeConfigDto feeConfigDto) throws Exception {
-
//褰撳墠璐圭敤椤规槸鍚�
BillDto tmpBillDto = new BillDto();
tmpBillDto.setCurBill("T");
tmpBillDto.setConfigId(feeConfigDto.getConfigId());
tmpBillDto.setCommunityId(feeConfigDto.getCommunityId());
+ Date startTime = getDefaultStartTime(feeConfigDto.getBillType());
+ tmpBillDto.setCurBillTime(DateUtil.getFormatTimeString(startTime, DateUtil.DATE_FORMATE_STRING_A));
List<BillDto> billDtos = feeInnerServiceSMOImpl.queryBills(tmpBillDto);
//Assert.listOnlyOne(billDtos, "褰撳墠瀛樺湪澶氫釜鏈夋晥璐﹀崟" + feeConfigDto.getConfigId());
@@ -139,8 +142,15 @@
billDto.setCommunityId(feeConfigDto.getCommunityId());
billDto.setConfigId(feeConfigDto.getConfigId());
billDto.setCurBill("T");
+ //鏌ヨ鍘嗗彶鏈夋晥璐﹀崟
+ tmpBillDto = new BillDto();
+ tmpBillDto.setCurBill("T");
+ tmpBillDto.setConfigId(feeConfigDto.getConfigId());
+ tmpBillDto.setCommunityId(feeConfigDto.getCommunityId());
+ billDtos = feeInnerServiceSMOImpl.queryBills(tmpBillDto);
- Date startTime = billDtos == null ? getDefaultStartTime(feeConfigDto.getBillType()) : DateUtil.getDateFromString(billDtos.get(0).getBillTime(), DateUtil.DATE_FORMATE_STRING_A);
+ startTime = (billDtos == null || billDtos.size() < 1) ? getDefaultStartTime(feeConfigDto.getBillType())
+ : DateUtil.getDateFromString(billDtos.get(0).getBillTime(), DateUtil.DATE_FORMATE_STRING_A);
FeeDto feeDto = new FeeDto();
feeDto.setConfigId(feeConfigDto.getConfigId());
@@ -151,15 +161,22 @@
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);
+ } catch (Exception e) {
+ logger.error("鐢熸垚璐圭敤澶辫触", e);
+ }
}
+
//鐢熸垚鏈璐﹀崟
Date billEndTime = DateUtil.getCurrentDate();
- billDto.setRemark(DateUtil.getFormatTimeString(startTime,DateUtil.DATE_FORMATE_STRING_A) +
- "-"+DateUtil.getFormatTimeString(billEndTime,DateUtil.DATE_FORMATE_STRING_A) + "璐﹀崟鏁版嵁");
+ billDto.setRemark(DateUtil.getFormatTimeString(startTime, DateUtil.DATE_FORMATE_STRING_A) +
+ "-" + DateUtil.getFormatTimeString(billEndTime, DateUtil.DATE_FORMATE_STRING_A) + "璐﹀崟鏁版嵁");
feeInnerServiceSMOImpl.insertBill(billDto);
}
@@ -192,7 +209,14 @@
return;
}
- computeFeePriceByRoom(feeDto);
+ if ("3333".equals(feeDto.getPayerObjType())) {
+ computeFeePriceByRoom(feeDto);
+ } else if ("6666".equals(feeDto.getPayerObjType())) {
+ computeFeePriceByParkingSpace(feeDto);
+ } else {
+ return;//杩欎釜娌℃湁娆犺垂鍙畻
+ //throw new IllegalArgumentException("鏆備笉鏀寔璇ョ被鍨嬪嚭璐�" + feeDto.getFeeId());
+ }
if (feeDto.getFeePrice() <= 0) {
return;//杩欎釜娌℃湁娆犺垂鍙畻
@@ -273,7 +297,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("鏈煡");
@@ -293,13 +317,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());
}
@@ -342,7 +366,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());
@@ -405,6 +429,42 @@
}
feeDto.setFeePrice(feePrice);
+
+ //鏌ヨ涓氫富淇℃伅
+
+
+ }
+
+ /**
+ * 鏍规嵁杞︿綅鏉ョ畻鍗曚环
+ *
+ * @param 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 {
+ feePrice = -1.00;
+ }
+
+ feeDto.setFeePrice(feePrice);
}
/**
--
Gitblit v1.8.0