Commit 04b20e3c48e0154b9f580180c774243181a14906
1 parent
0a84c5d4bf
Exists in
master
and in
6 other branches
产检券
Showing 1 changed file with 5 additions and 6 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
04b20e3
| ... | ... | @@ -180,20 +180,19 @@ |
| 180 | 180 | |
| 181 | 181 | for (Map<String,Object> map : temps) |
| 182 | 182 | { |
| 183 | + Integer type = Integer.parseInt(map.get("type").toString()); | |
| 184 | + Integer showStart = Integer.parseInt(map.get("show_start").toString()); | |
| 185 | + Integer showEnd = Integer.parseInt(map.get("show_end").toString()); | |
| 183 | 186 | if (person.getType() == 1) |
| 184 | 187 | { |
| 185 | - Integer type = Integer.parseInt(map.get("type").toString()); | |
| 186 | - Integer showStart = Integer.parseInt(map.get("show_start").toString()); | |
| 187 | - if (type == 2 && showStart <= start) | |
| 188 | + if (type == 2 && ((showStart <= start && showEnd >= start) || showStart >= start)) | |
| 188 | 189 | { |
| 189 | 190 | list.add(map); |
| 190 | 191 | } |
| 191 | 192 | } |
| 192 | 193 | else if (person.getType() == 3) |
| 193 | 194 | { |
| 194 | - Integer type = Integer.parseInt(map.get("type").toString()); | |
| 195 | - Integer showStart = Integer.parseInt(map.get("show_start").toString()); | |
| 196 | - if (type == 6 && showStart <= start) | |
| 195 | + if (type == 6 && ((showStart <= start && showEnd >= start) || showStart >= start)) | |
| 197 | 196 | { |
| 198 | 197 | list.add(map); |
| 199 | 198 | } |