xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding filter coupon logic .

Browse Source
This commit is contained in:
376654749@qq.com 2022-03-10 10:57:16 +08:00
parent 9c4e7baf8c
commit e057f0cce0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
View File

@ -39,7 +39,7 @@ public class CouponService {
} }
public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{ public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{
String productCode = couponGetAllEntity.getProductCode(); String productCode = couponGetAllEntity.getProductCodes();
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity);
paramMap.remove("productCode"); paramMap.remove("productCode");
paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus())); 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 ++){ for(int i = 0;i < jsonArray.size();i ++){
JSONObject jsonResult = (JSONObject)jsonArray.get(i); JSONObject jsonResult = (JSONObject)jsonArray.get(i);
if(jsonResult.getString("udf2") != null) { if(jsonResult.getString("udf2") != null) {
if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)) { if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) {
if (jsonResult.get("productCodes").toString().indexOf(productCode) != -1){
afterFilterArrary.add(jsonResult); afterFilterArrary.add(jsonResult);
}
}else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)){ }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); afterFilterArrary.add(jsonResult);
} }
} }

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/coupon/CouponGetAllEntity.java
View File

@ -110,6 +110,6 @@ public class CouponGetAllEntity {
private int page; private int page;
private String productCode = ""; private String productCodes = "";
} }