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

!225 adding filter coupon logic

Browse Source 
Merge pull request !225 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-03-14 07:58:14 +00:00 committed by Gitee
commit eacdc88529
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ public class CouponService {
public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{
String[] productCode = couponGetAllEntity.getProductCodes().split(",");
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity);
Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "2099-01-01":paramMap.get("useStartDate"));
Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "1990-01-01":paramMap.get("useStartDate"));
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()));