From e057f0cce0d9cac196ab141f6f78692d8aa79d4a Mon Sep 17 00:00:00 2001 From: "376654749@qq.com" Date: Thu, 10 Mar 2022 10:57:16 +0800 Subject: [PATCH] adding filter coupon logic . --- .../module/system/royalcanin/CouponService.java | 8 +++----- .../system/royalcanin/coupon/CouponGetAllEntity.java | 2 +- 2 files changed, 4 insertions(+), 6 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 3451f7eb..77dd2d53 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 @@ -39,7 +39,7 @@ public class CouponService { } public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ - String productCode = couponGetAllEntity.getProductCode(); + String productCode = couponGetAllEntity.getProductCodes(); Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); paramMap.remove("productCode"); paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); @@ -54,12 +54,10 @@ 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)) { - if (jsonResult.get("productCodes").toString().indexOf(productCode) != -1){ + if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) { afterFilterArrary.add(jsonResult); - } }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)){ - if (jsonResult.get("productCodes").toString().indexOf(productCode) != -1 && productCode.equals(jsonResult.get("storeCodes").toString())){ + if (jsonResult.get("productCodes").toString().indexOf(productCode) != -1){ afterFilterArrary.add(jsonResult); } } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java index 2bbd0e71..2391c848 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java @@ -110,6 +110,6 @@ public class CouponGetAllEntity { private int page; - private String productCode = ""; + private String productCodes = ""; }