From 666b2c581d3fa8097f566e3ba6af2e593305e65a Mon Sep 17 00:00:00 2001 From: "376654749@qq.com" Date: Mon, 14 Mar 2022 15:02:31 +0800 Subject: [PATCH 1/3] coupon Date --- .../module/system/royalcanin/CouponService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 e6d5bfb1..10823049 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 @@ -5,10 +5,12 @@ import com.alibaba.fastjson.JSONObject; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.system.royalcanin.coupon.*; import net.lab1024.smartadmin.util.MapRemoveNullUtil; +import net.lab1024.smartadmin.util.SmartDateUtil; import net.lab1024.smartadmin.util.SmartHttpUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.Map; @Service @@ -41,11 +43,12 @@ public class CouponService { public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ String[] productCode = couponGetAllEntity.getProductCodes().split(","); Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); + Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "2099-01-01":paramMap.get("useStartDate")); paramMap.remove("productCodes"); paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage())); paramMap.put("rows",StringUtil.toString(couponGetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getRows())); - paramMap.replace("usestartDate",paramMap.get("useStartDate")); + paramMap.put("usestartDate",paramMap.get("useStartDate")); paramMap.remove("useStartDate"); MapRemoveNullUtil.removeNullEntry(paramMap); String result = SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); @@ -56,9 +59,11 @@ public class CouponService { for(int i = 0;i < jsonArray.size();i ++){ JSONObject jsonResult = (JSONObject)jsonArray.get(i); if(jsonResult.getString("udf2") != null) { - if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) { + //&&compareDate.compareTo(currentDate)>=0 + Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").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)){ + }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)==-1){ for(int g = 0 ;g Date: Mon, 14 Mar 2022 15:18:34 +0800 Subject: [PATCH 2/3] 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 Date: Mon, 14 Mar 2022 15:57:21 +0800 Subject: [PATCH 3/3] coupon Date --- .../smartadmin/module/system/royalcanin/CouponService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7a8110f6..cfcae6bd 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 @@ -43,7 +43,7 @@ public class CouponService { public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ String[] productCode = couponGetAllEntity.getProductCodes().split(","); Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); - Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "2099-01-01":paramMap.get("useStartDate")); + Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "1990-01-01":paramMap.get("useStartDate")); paramMap.remove("productCodes"); paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage()));