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

!206 adding filter coupon logic

Browse Source 
Merge pull request !206 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-03-10 02:59:47 +00:00 committed by Gitee
commit 48cdfaa447
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
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{
String productCode = couponGetAllEntity.getProductCode();
String productCode = couponGetAllEntity.getProductCodes();
Map<String, String> 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);
}
}

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 String productCode = "";
private String productCodes = "";
}