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

!241 Leung

Browse Source 
Merge pull request !241 from Admin/LTL_20220314
This commit is contained in:
Admin 2022-03-17 08:13:59 +00:00 committed by Gitee
commit 741c77672d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,7 @@ public class CouponService {
Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString()); Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString());
//优惠券有效开始时间 //优惠券有效开始时间
Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString()); Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString());
if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) {
&& startDate.compareTo(nowDate) != 1) {
afterFilterArrary.add(jsonResult); afterFilterArrary.add(jsonResult);
}else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1 }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1
&& startDate.compareTo(nowDate) != 1){ && startDate.compareTo(nowDate) != 1){