From 3506bf3b0d3a59ecb94ab9a903b5b8a03773a910 Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 18 May 2017 19:27:00 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/permission/service/impl/CouponServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index ab289da..b6c3fa1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -393,7 +393,8 @@ public class CouponServiceImpl implements CouponService { Map params = new HashMap<>(); params.put("hId", hId); - params.put("dpId", person.getType() == 2 ? "1" : "2"); +// params.put("dpId", person.getType() == 2 ? "1" : "2"); + params.put("dpId", person.getType() == 2 ? "2" : "1"); String s = HttpClientUtil.doGet(PropertiesUtil.getInstance().getDefault("or.code.create.url"), params, "utf-8", null); JSONObject jsonObject = JSONObject.fromObject(s); return jsonObject.get("url").toString(); @@ -491,7 +492,8 @@ public class CouponServiceImpl implements CouponService { endDate = DateUtils.addMonths(midDate, end + 1); } if(validateType == 2) { /**使用 */ - if(DateUtil.isBetween(new Date(), startDate, endDate)) { +// if(DateUtil.isBetween(new Date(), startDate, endDate)) { + if(DateUtil.isBetween(new Date(), startDate, DateUtils.addDays(endDate, 1))) { return true; } } else if(validateType == 1) { -- 1.8.3.1