From 4a89f51744230ffb58a4d8236c55980b26de99f7 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 22 七月 2022 17:29:10 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 2c81f42..3638344 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -625,7 +625,7 @@
if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
computeFeeSMOImpl.dealRentRateCycle(feeDto,cycles.doubleValue());
if(feeDto.getOweFee()> 0){
- businessFeeDetail.put("receivableAmount", feeDto.getOweFee());
+ businessFeeDetail.put("receivableAmount", feeDto.getAmountOwed());
}
}
}
@@ -649,13 +649,7 @@
System.out.println(endCalender);
} else if ("-103".equals(paramInJson.getString("cycles"))) {
String custEndTime = paramInJson.getString("custEndTime");
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date endDates = null;
- try {
- endDates = format.parse(custEndTime);
- } catch (ParseException e) {
- e.printStackTrace();
- }
+ Date endDates = DateUtil.getDateFromStringB(custEndTime);
Calendar c = Calendar.getInstance();
c.setTime(endDates);
c.add(Calendar.DAY_OF_MONTH, 1);
@@ -682,6 +676,11 @@
if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
maxEndTime = feeInfo.getConfigEndTime();
}
+
+ if(FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeInfo.getFeeFlag())){
+ maxEndTime = feeInfo.getMaxEndTime();
+ }
+
//鍒ゆ柇 缁撴潫鏃堕棿 鏄惁澶т簬 璐圭敤椤� 缁撴潫鏃堕棿锛岃繖閲� 瀹归敊涓�涓嬶紝濡傛灉 璐圭敤缁撴潫鏃堕棿澶т簬 璐圭敤椤圭粨鏉熸椂闂� 30澶� 璧版姤閿� 灞炰簬澶氱即璐�
if (feeInfo.getEndTime().getTime() - maxEndTime.getTime() > 30 * 24 * 60 * 60 * 1000L) {
throw new IllegalArgumentException("缂磋垂瓒呰繃浜� 璐圭敤椤圭粨鏉熸椂闂�");
@@ -705,7 +704,7 @@
calendar.add(Calendar.DAY_OF_MONTH, -5);
maxEndTime = calendar.getTime();
if (feeInfo.getEndTime().after(maxEndTime)) {
- businessFee.put("state", FeeStateConstant.END);
+ businessFee.put("state", FeeDto.STATE_FINISH);
businessFee.put("endTime", maxEndTime);
}
}
--
Gitblit v1.8.0