From 98e6a6f329c70dfe78881afefad5bce6bd90f8a1 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 11 Mar 2022 21:19:19 +0800 Subject: [PATCH 1/3] debugger --- .../module/system/royalcanin/CouponService.java | 10 ++++++---- 1 file changed, 6 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 d8f741f5..ed22d7c2 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,9 +39,9 @@ public class CouponService { } public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ - String productCode = couponGetAllEntity.getProductCodes(); + String[] productCode = couponGetAllEntity.getProductCodes().split(","); Map paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); - paramMap.remove("productCode"); + 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())); @@ -57,8 +57,10 @@ public class CouponService { if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) { afterFilterArrary.add(jsonResult); }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)){ - if ((jsonResult.get("productCodes")!=null?jsonResult.get("productCodes").toString().indexOf(productCode):"".indexOf(productCode)) != -1 ||jsonResult.get("productCodes")==null){ - afterFilterArrary.add(jsonResult); + for(int g = 0 ;g Date: Fri, 11 Mar 2022 21:38:45 +0800 Subject: [PATCH 2/3] debugger --- .../module/system/royalcanin/coupon/CouponGetAllEntity.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/coupon/CouponGetAllEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java index 2391c848..a5003610 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 @@ -95,7 +95,7 @@ public class CouponGetAllEntity { * 优惠券使用开始日期 */ @ApiModelProperty(example = "2019-09-01") - private String useStartDate; + private String usestartDate; /** * 优惠券使用结束日期 From 7b4b9050b794469e5123be8d4a9c6211d15aa54a Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Fri, 11 Mar 2022 21:44:06 +0800 Subject: [PATCH 3/3] debugger --- .../smartadmin/module/system/royalcanin/CouponService.java | 2 ++ .../module/system/royalcanin/coupon/CouponGetAllEntity.java | 2 +- 2 files changed, 3 insertions(+), 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 ed22d7c2..e6d5bfb1 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 @@ -45,6 +45,8 @@ public class CouponService { 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.remove("useStartDate"); MapRemoveNullUtil.removeNullEntry(paramMap); String result = SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); //过滤非官网数据 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 a5003610..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 @@ -95,7 +95,7 @@ public class CouponGetAllEntity { * 优惠券使用开始日期 */ @ApiModelProperty(example = "2019-09-01") - private String usestartDate; + private String useStartDate; /** * 优惠券使用结束日期