From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java | 109 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 41 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 3ca022f..8e92b02 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
@@ -5,14 +5,12 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.payFeeDetailMonth.PayFeeDetailMonthDto;
-import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
+import com.java110.dto.payFee.PayFeeDetailMonthDto;
+import com.java110.dto.payFee.PayFeeMonthOwnerDto;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
-import com.java110.po.payFeeDetailMonth.PayFeeDetailMonthPo;
-import com.java110.utils.util.BeanConvertUtil;
+import com.java110.po.payFee.PayFeeDetailMonthPo;
import com.java110.utils.util.DateUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,16 +52,16 @@
Double feePrice = Double.parseDouble(feePriceAll.get("feePrice").toString());
//todo 濡傛灉鏄竴娆℃�ц垂鐢� 闄や互
- if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getPayerObjType())) {
- return feePrice;
- }
- double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(feeDto.getStartTime(), feeDto.getEndTime()));
- if (maxMonth <= 0) {
- return feePrice;
-
- }
- BigDecimal feePriceDec = new BigDecimal(feePrice).divide(new BigDecimal(maxMonth), 2, BigDecimal.ROUND_HALF_UP);
- feePrice = feePriceDec.doubleValue();
+// if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getPayerObjType())) {
+// return feePrice;
+// }
+// double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(feeDto.getStartTime(), feeDto.getEndTime()));
+// if (maxMonth <= 0) {
+// return feePrice;
+//
+// }
+// BigDecimal feePriceDec = new BigDecimal(feePrice).divide(new BigDecimal(maxMonth), 2, BigDecimal.ROUND_HALF_UP);
+// feePrice = feePriceDec.doubleValue();
return feePrice;
}
@@ -87,7 +85,7 @@
* @param feeDto
* @param payFeeMonthOwnerDto
*/
- @Autowired
+ @Override
public void waitDispersedFeeDetail(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto) {
PayFeeDetailMonthDto payFeeDetailMonthDto = new PayFeeDetailMonthDto();
payFeeDetailMonthDto.setCommunityId(feeDto.getCommunityId());
@@ -97,6 +95,7 @@
if (feeDetailDtos == null || feeDetailDtos.size() < 1) {
return;
}
+
for (FeeDetailDto feeDetailDto : feeDetailDtos) {
// todo 閫愭潯鍘荤鏁�
@@ -113,12 +112,9 @@
* @param feePrice
* @param deadlineTime
*/
- @Autowired
+ @Override
public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime) {
- // todo 璐圭敤宸茬粡缁撴潫
- if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
- return;
- }
+
// todo 娓呯悊 detailId 涓�-1 鐨勬暟鎹�
PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
@@ -127,12 +123,28 @@
payFeeDetailMonthPo.setDetailId("-1");
payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+ // todo 璐圭敤宸茬粡缁撴潫
+ if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
+ return;
+ }
+
List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
// todo 澶勭悊 寮�濮嬫椂闂村拰缁撴潫鏃堕棿
Date startTime = DateUtil.timeToDate(feeDto.getEndTime());
Date endTime = DateUtil.timeToDate(deadlineTime);
BigDecimal receivableAmount = new BigDecimal(feePrice);
+
+ BigDecimal dayReceivableAmount = null;
+
+ //todo 涓�娆℃�ц垂鐢� 鏃ュ簲鏀惰绠�
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
+ int day = DateUtil.daysBetween(endTime, startTime);
+ if (day < 1) {
+ day = 1;
+ }
+ dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
+ }
// todo 瀵绘壘绗竴涓嚜鐒舵湀 涓�鏃�
Calendar firstMonthDayCal = Calendar.getInstance();
@@ -146,20 +158,27 @@
int curDay = 0;
int curMonthMaxDay = 30;
BigDecimal curMonthReceivableAmount = null;
- BigDecimal dayReceivableAmount = null;
+
while (firstMonthDayTime.getTime() < endTime.getTime()) {
curDay = DateUtil.daysBetween(firstMonthDayTime, startMonthDayTime);
-
// todo 璁＄畻褰撴湀澶╂暟
Calendar calendar = Calendar.getInstance();
calendar.setTime(startMonthDayTime);
curMonthMaxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
- dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
- // todo 璁＄畻 搴旀敹
- curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+ // todo 濡傛灉涓嶆槸鏁存湀锛屽垯杞崲涓烘寜澶╄绠�
+// if (curDay != curMonthMaxDay) {
+ //todo 鍛ㄦ湡鎬ц垂鐢� 鏃ュ簲鏀堕噸鏂扮畻
+ if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
+ dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
+ }
+ // todo 璁＄畻 搴旀敹
+ curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+// } else { // todo 濡傛灉鏄暣鏈� 閭ｅ氨鎸夋湀璁＄畻锛屼互鍏� 杞崲鎴愬ぉ鍐� 涔樹互澶╂暟鍚庣殑璇樊
+// curMonthReceivableAmount = receivableAmount;
+// }
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime, deadlineTime);
// todo 灏唖tartTime 淇敼涓� 涓嬫湀1鏃ユ椂闂�
startMonthDayTime = firstMonthDayTime;
@@ -174,22 +193,29 @@
}
curDay = DateUtil.daysBetween(endTime, startMonthDayTime);
-
// todo 璁＄畻褰撴湀澶╂暟
Calendar calendar = Calendar.getInstance();
calendar.setTime(startMonthDayTime);
curMonthMaxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
- dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
- // todo 璁＄畻 搴旀敹
- curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
-
+ // todo 濡傛灉涓嶆槸鏁存湀锛屽垯杞崲涓烘寜澶╄绠�
+ if (curDay != curMonthMaxDay) {
+ //todo 鍛ㄦ湡鎬ц垂鐢� 鏃ュ簲鏀堕噸鏂扮畻
+ if (!FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
+ dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
+ }
+ // todo 璁＄畻 搴旀敹
+ curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+ } else { // todo 濡傛灉鏄暣鏈� 閭ｅ氨鎸夋湀璁＄畻锛屼互鍏� 杞崲鎴愬ぉ鍐� 涔樹互澶╂暟鍚庣殑璇樊
+ curMonthReceivableAmount = receivableAmount;
+ }
// todo 淇濆瓨鏁版嵁鍒皃ay_fee_detail_month
- toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime);
+ toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto, payFeeDetailMonthPos, startMonthDayTime, deadlineTime);
payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
}
- private void doDispersedFeeDetail(FeeDetailDto feeDetailDto, FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto) {
+ private void doDispersedFeeDetail(FeeDetailDto feeDetailDto, FeeDto feeDto, PayFeeMonthOwnerDto
+ payFeeMonthOwnerDto) {
List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
// todo 鍘婚櫎 寮�濮嬫椂闂村拰 缁撴潫鏃堕棿鐨� 灏忔椂 鍒嗛挓 绉�
@@ -204,8 +230,8 @@
BigDecimal receivableAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivableAmount()));
BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivedAmount()));
- BigDecimal dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
- BigDecimal dayReceivedAmount = receivedAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
+ BigDecimal dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 搴旀敹
+ BigDecimal dayReceivedAmount = receivedAmount.divide(new BigDecimal(day), 8, BigDecimal.ROUND_HALF_UP);// 鏃� 瀹炴敹
// todo 瀵绘壘绗竴涓嚜鐒舵湀 涓�鏃�
Calendar firstMonthDayCal = Calendar.getInstance();
@@ -227,7 +253,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, endTime);
// todo 灏唖tartTime 淇敼涓� 涓嬫湀1鏃ユ椂闂�
startMonthDayTime = firstMonthDayTime;
@@ -248,7 +274,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, endTime);
payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
}
@@ -267,7 +293,8 @@
FeeDto feeDto,
PayFeeMonthOwnerDto payFeeMonthOwnerDto,
List<PayFeeDetailMonthPo> payFeeDetailMonthPos,
- Date curTime) {
+ Date curTime,
+ Date deadlineTime) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(curTime);
@@ -288,7 +315,7 @@
getDiscountAmount(Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivableAmount()),
Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivedAmount()),
calendar.getTime(), feeDto) + "");
- tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId));
+ tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId, true));
tmpPayFeeDetailMonthPo.setRemark("绋嬪簭璁＄畻鐢熸垚");
tmpPayFeeDetailMonthPo.setObjName(payFeeMonthOwnerDto.getObjName());
tmpPayFeeDetailMonthPo.setObjId(payFeeMonthOwnerDto.getObjId());
@@ -296,6 +323,7 @@
tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
+ tmpPayFeeDetailMonthPo.setDeadlineTime(DateUtil.getFormatTimeStringA(deadlineTime));
if (feeDetailDto == null) {
tmpPayFeeDetailMonthPo.setPayFeeTime(null);
} else { // todo 浜よ垂璁板綍 淇濆瓨鏃�
@@ -307,7 +335,6 @@
payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
}
-
}
--
Gitblit v1.8.0