From f4dbf3ffa233786dbb4e28ab2174a304e34fece8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 18 五月 2023 02:24:35 +0800
Subject: [PATCH] 优化 离散月
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 128 +++++-------------------------------------
1 files changed, 15 insertions(+), 113 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
index be4bddb..3ca022f 100644
--- a/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
+++ b/service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java
@@ -68,49 +68,6 @@
}
- public Double getReceivableAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto) {
- FeeDetailDto feeDetailDto = getCurFeeDetail(feeDetailDtos, curDate);
-
- if (feeDetailDto == null && curDate.getTime() < feeDto.getEndTime().getTime()) {
- return 0.00;
- }
-
- return feePrice;
- }
-
- @Override
- public Double getReceivedAmount(List<FeeDetailDto> feeDetailDtos, Double feePrice, Date curDate, FeeDto feeDto) {
- //todo 杩欑鎯呭喌涓嬪簲璇� 瀹炴敹涓�0
- if (curDate.getTime() >= feeDto.getEndTime().getTime()) {
- return 0.00;
- }
- //todo 濡傛灉 fee 涓虹┖
- if (feeDetailDtos == null) {
- return feePrice;
- }
- FeeDetailDto feeDetailDto = getCurFeeDetail(feeDetailDtos, curDate);
-
- if (feeDetailDto == null && curDate.getTime() < feeDto.getEndTime().getTime()) {
- return 0.00;
- }
-
- if (feeDetailDto == null) {
- return feePrice;
- }
-
- double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(feeDetailDto.getStartTime(), feeDetailDto.getEndTime()));
-
- if (maxMonth < 1) {
- return Double.parseDouble(feeDetailDto.getReceivedAmount());
- }
-
- BigDecimal totalRecDec = new BigDecimal(feeDetailDto.getReceivedAmount());
- //姣忔湀骞冲潎鍊�
- BigDecimal priRecDec = totalRecDec.divide(new BigDecimal(maxMonth), 4, BigDecimal.ROUND_HALF_UP);
-
- return priRecDec.doubleValue();
- }
-
@Override
public Double getDiscountAmount(Double feePrice, double receivedAmount, Date curDate, FeeDto feeDto) {
@@ -123,32 +80,10 @@
return discountAmountDec.doubleValue();
}
- @Override
- public String getFeeDetailId(List<FeeDetailDto> feeDetailDtos, Date curDate) {
- FeeDetailDto feeDetailDto = getCurFeeDetail(feeDetailDtos, curDate);
-
- if (feeDetailDto == null) {
- return "-1";
- }
- return feeDetailDto.getDetailId();
- }
-
- @Override
- public String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId) {
-
- if (feeDetailDtos == null || feeDetailDtos.size() < 1) {
- return null;
- }
- for (FeeDetailDto feeDetailDto : feeDetailDtos) {
- if (feeDetailDto.getDetailId().equals(detailId)) {
- return DateUtil.getFormatTimeStringA(feeDetailDto.getCreateTime());
- }
- }
- return null;
- }
/**
- * 澶勭悊宸茬粡浜よ繃璐圭殑璁板綍澶勭悊
+ * 澶勭悊宸茬粡浜よ繃璐圭殑璁板綍澶勭悊
+ *
* @param feeDto
* @param payFeeMonthOwnerDto
*/
@@ -172,6 +107,7 @@
/**
* 澶勭悊 娆犺垂 绂绘暎
+ *
* @param feeDto
* @param payFeeMonthOwnerDto
* @param feePrice
@@ -180,8 +116,8 @@
@Autowired
public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime) {
// todo 璐圭敤宸茬粡缁撴潫
- if(FeeDto.STATE_FINISH.equals(feeDto.getState())){
- return ;
+ if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ return;
}
// todo 娓呯悊 detailId 涓�-1 鐨勬暟鎹�
@@ -211,7 +147,7 @@
int curMonthMaxDay = 30;
BigDecimal curMonthReceivableAmount = null;
BigDecimal dayReceivableAmount = null;
- while (firstMonthDayTime.getTime() > endTime.getTime()) {
+ while (firstMonthDayTime.getTime() < endTime.getTime()) {
curDay = DateUtil.daysBetween(firstMonthDayTime, startMonthDayTime);
// todo 璁＄畻褰撴湀澶╂暟
@@ -223,7 +159,7 @@
curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
// todo 灏唖tartTime 淇敼涓� 涓嬫湀1鏃ユ椂闂�
startMonthDayTime = firstMonthDayTime;
@@ -248,7 +184,7 @@
curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
}
@@ -283,7 +219,7 @@
int curDay = 0;
BigDecimal curMonthReceivableAmount = null;
BigDecimal curMonthReceivedAmount = null;
- while (firstMonthDayTime.getTime() > endTime.getTime()) {
+ while (firstMonthDayTime.getTime() < endTime.getTime()) {
curDay = DateUtil.daysBetween(firstMonthDayTime, startMonthDayTime);
// todo 璁＄畻 搴旀敹
curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
@@ -291,7 +227,7 @@
curMonthReceivedAmount = new BigDecimal(curDay).multiply(dayReceivedAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
// todo 灏唖tartTime 淇敼涓� 涓嬫湀1鏃ユ椂闂�
startMonthDayTime = firstMonthDayTime;
@@ -312,7 +248,7 @@
curMonthReceivedAmount = new BigDecimal(curDay).multiply(dayReceivedAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
}
@@ -338,9 +274,9 @@
PayFeeDetailMonthPo tmpPayFeeDetailMonthPo = new PayFeeDetailMonthPo();
tmpPayFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
tmpPayFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
- if(feeDetailDto == null){
+ if (feeDetailDto == null) {
tmpPayFeeDetailMonthPo.setDetailId("-1");
- }else{ // todo 浜よ垂璁板綍 淇濆瓨鏃�
+ } else { // todo 浜よ垂璁板綍 淇濆瓨鏃�
tmpPayFeeDetailMonthPo.setDetailId(feeDetailDto.getDetailId());
}
tmpPayFeeDetailMonthPo.setDetailYear(calendar.get(Calendar.YEAR) + "");
@@ -360,9 +296,9 @@
tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
- if(feeDetailDto == null){
+ if (feeDetailDto == null) {
tmpPayFeeDetailMonthPo.setPayFeeTime(null);
- }else{ // todo 浜よ垂璁板綍 淇濆瓨鏃�
+ } else { // todo 浜よ垂璁板綍 淇濆瓨鏃�
tmpPayFeeDetailMonthPo.setPayFeeTime(DateUtil.getFormatTimeStringA(feeDetailDto.getCreateTime()));
}
tmpPayFeeDetailMonthPo.setState("W"); // todo 杩欓噷鏆傛椂鍐欐锛岀洰鍓嶇敤涓嶅埌锛岀畻鏄鐣欏瓧娈�
@@ -372,40 +308,6 @@
}
- /**
- * 鑾峰彇褰撳墠缂磋垂璁板綍
- *
- * @param feeDetailDtos
- * @param curDate
- * @return
- */
- private FeeDetailDto getCurFeeDetail(List<FeeDetailDto> feeDetailDtos, Date curDate) {
- if (feeDetailDtos == null || feeDetailDtos.size() < 1) {
- return null;
- }
- List<FeeDetailDto> tFeeDetailDtos = new ArrayList<>();
- for (FeeDetailDto feeDetailDto : feeDetailDtos) {
- if (feeDetailDto.getStartTime().getTime() <= curDate.getTime() && feeDetailDto.getEndTime().getTime() > curDate.getTime()) {
- tFeeDetailDtos.add(BeanConvertUtil.covertBean(feeDetailDto,FeeDetailDto.class));
- }
- }
-
- if (tFeeDetailDtos.size() < 1) {
- return null;
- }
- if (tFeeDetailDtos.size() == 1) {
- return tFeeDetailDtos.get(0);
- }
- //todo 杩欑搴旇鏄暟鎹紓甯� 涔熷氨鏄竴涓湀璐圭敤鍙樻洿鍚庨噸澶嶇即璐�
- BigDecimal cReceivedAmount = new BigDecimal(0.00);
- for (FeeDetailDto feeDetailDto : tFeeDetailDtos) {
- cReceivedAmount = cReceivedAmount.add(new BigDecimal(Double.parseDouble(feeDetailDto.getReceivedAmount()))).setScale(4, BigDecimal.ROUND_HALF_UP);
- }
-
- tFeeDetailDtos.get(0).setReceivedAmount(cReceivedAmount.doubleValue() + "");
-
- return tFeeDetailDtos.get(0);
- }
}
--
Gitblit v1.8.0