From: sijun.li <sijun.li@supwisdom.com>
Date: Thu, 24 Sep 2020 03:28:14 +0000 (+0800)
Subject: 修复积分bug
X-Git-Tag: 1.0.26^2~5
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=16302f15657a38bb7a00b1af13f4431e1525bbb0;p=epayment%2Ffood_payapi.git

修复积分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 8bf82aeb..e566af09 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 @@ public class PointsServiceImpl implements PointsService {
       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 @@ public class PointsServiceImpl implements PointsService {
         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());
         }
       }