From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java b/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
index 910d6c0..7b2c286 100644
--- a/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
@@ -2,7 +2,7 @@
import com.java110.dto.machine.CarInoutDto;
-import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigAttrDto;
+import com.java110.dto.fee.TempCarFeeConfigAttrDto;
import com.java110.utils.util.DateUtil;
import java.text.ParseException;
@@ -55,7 +55,7 @@
double min = 0.0;
try {
//涓嶆槸鏀粯瀹屾垚 鐘舵��
- if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState())) {
+ if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())) {
try {
payTime = DateUtil.getDateFromString(carInoutDto.getPayTime(), DateUtil.DATE_FORMATE_STRING_A);
--
Gitblit v1.8.0