修复积分bug
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
index 8bf82ae..e566af0 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
@@ -237,7 +237,7 @@
if (rate < Double.parseDouble(noActivetemp.getRate())) {
String noStartdate = noActivetemp.getStartdate();
String noEnddate = noActivetemp.getEnddate();
- if (DateUtil.compareDatetime(nowDateTemp, noStartdate) >= 0 && DateUtil.compareDatetime(noEnddate, nowDateTemp) >= 0) {
+ if (DateUtil.compareDatetime(DateUtil.getNow("yyyyMMddHHmmss"), noStartdate+"000000") >= 0 && DateUtil.compareDatetime(noEnddate+"235959", DateUtil.getNow("yyyyMMddHHmmss")) >= 0) {
rate = Double.parseDouble(noActivetemp.getRate());
}
}
@@ -249,7 +249,8 @@
String yearStartdate = yearActivetemp.getStartdate();
String yearEnddate = yearActivetemp.getEnddate();
String yearDateTemp = DateUtil.getNow("MMdd");
- if (DateUtil.compareDatetime(yearDateTemp, yearStartdate) >= 0 && DateUtil.compareDatetime(yearEnddate, yearDateTemp) >= 0) {
+ String yearTemp = DateUtil.getNow("yyyy");
+ if (DateUtil.compareDatetime(yearTemp+yearDateTemp+"000000", yearTemp+yearStartdate+"000000") >= 0 && DateUtil.compareDatetime(yearTemp+yearEnddate+"000000", yearTemp+yearDateTemp+"000000") >= 0) {
rate = Double.parseDouble(yearActivetemp.getRate());
}
}