From b3ddebce4e76b3726b7ec9fabf5ef16381a64952 Mon Sep 17 00:00:00 2001
From: "376654749@qq.com" <bobbin262246>
Date: Mon, 14 Mar 2022 15:18:34 +0800
Subject: [PATCH] coupon Date

---
 .../smartadmin/module/system/royalcanin/CouponService.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
index 10823049..7a8110f6 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
@@ -59,11 +59,10 @@ public class CouponService {
         for(int i = 0;i < jsonArray.size();i ++){
             JSONObject jsonResult = (JSONObject)jsonArray.get(i);
             if(jsonResult.getString("udf2") != null) {
-                //&&compareDate.compareTo(currentDate)>=0
-                Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString());
-                if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)==-1) {
+                Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString());
+                if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1) {
                         afterFilterArrary.add(jsonResult);
-                }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)==-1){
+                }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1){
                     for(int g = 0 ;g<productCode.length;g++) {
                         if ((jsonResult.get("productCodes") != null ? jsonResult.get("productCodes").toString().indexOf(productCode[g]) : "".indexOf(productCode[g])) != -1 || jsonResult.get("productCodes") == null) {
                             afterFilterArrary.add(jsonResult);