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..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 @@ -39,12 +39,14 @@ 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())); + paramMap.replace("usestartDate",paramMap.get("useStartDate")); + paramMap.remove("useStartDate"); MapRemoveNullUtil.removeNullEntry(paramMap); String result = SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null); //过滤非官网数据 @@ -57,8 +59,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