Commit 3506bf3b0d3a59ecb94ab9a903b5b8a03773a910
1 parent
1ad8c89d25
Exists in
master
and in
6 other branches
bug修复
Showing 1 changed file with 4 additions and 2 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
3506bf3
| ... | ... | @@ -393,7 +393,8 @@ |
| 393 | 393 | |
| 394 | 394 | Map<String, String> params = new HashMap<>(); |
| 395 | 395 | params.put("hId", hId); |
| 396 | - params.put("dpId", person.getType() == 2 ? "1" : "2"); | |
| 396 | +// params.put("dpId", person.getType() == 2 ? "1" : "2"); | |
| 397 | + params.put("dpId", person.getType() == 2 ? "2" : "1"); | |
| 397 | 398 | String s = HttpClientUtil.doGet(PropertiesUtil.getInstance().getDefault("or.code.create.url"), params, "utf-8", null); |
| 398 | 399 | JSONObject jsonObject = JSONObject.fromObject(s); |
| 399 | 400 | return jsonObject.get("url").toString(); |
| ... | ... | @@ -491,7 +492,8 @@ |
| 491 | 492 | endDate = DateUtils.addMonths(midDate, end + 1); |
| 492 | 493 | } |
| 493 | 494 | if(validateType == 2) { /**使用 */ |
| 494 | - if(DateUtil.isBetween(new Date(), startDate, endDate)) { | |
| 495 | +// if(DateUtil.isBetween(new Date(), startDate, endDate)) { | |
| 496 | + if(DateUtil.isBetween(new Date(), startDate, DateUtils.addDays(endDate, 1))) { | |
| 495 | 497 | return true; |
| 496 | 498 | } |
| 497 | 499 | } else if(validateType == 1) { |