diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index a5c2f20da..507ce53d6 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.spec.InvalidKeySpecException; @@ -708,13 +709,14 @@ public class CommonService { // 如果conditionType为1判断充电度数, 如果为2判断充电时长 boolean flag = false; + BigDecimal conditionValue = new BigDecimal(chargeParkingDiscount.getConditionValue()); if (StringUtils.equals(conditionType, Constants.ONE)) { - if (Integer.parseInt(chargingDegree) >= Integer.parseInt(chargeParkingDiscount.getConditionValue())) { + if (new BigDecimal(chargingDegree).compareTo(conditionValue) > 0) { // 发券 flag = true; } } else if (StringUtils.equals(conditionType, Constants.TWO)) { - if (Integer.parseInt(sumChargingTime) >= Integer.parseInt(chargeParkingDiscount.getConditionValue())) { + if (new BigDecimal(sumChargingTime).compareTo(conditionValue) > 0) { // 发券 flag = true; }