From 89e96739bdffd3693efa61e04d3ae929d1285f8b Mon Sep 17 00:00:00 2001 From: Burce Date: Sat, 31 Aug 2019 16:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCouponSend.java | 3 +++ .../service/impl/WxCouponSendServiceImpl.java | 5 +++++ .../java/com/iformall/utils/DateUtils.java | 19 +++++++++++++++---- .../resources/mapper/WxCouponSendMapper.xml | 1 - 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index cb1b82335..1328767e0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -66,6 +66,9 @@ public class WxCouponSend extends BaseEntity { @JsonIgnore public static final String SORT_REMAIN = "merchantRemain" ; + @JsonIgnore + public static final String SORT_CREATE_DATE = "create_date" ; + @Id protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 63390dfe8..ae8aabe4b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -85,6 +85,11 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { JSONObject jo = JSONObject.parseObject(cs.getConditions()); int inventory = jo.getIntValue(WxCouponSend.KEY_MERCHANT_LNVENTORY); cs.setInventory(inventory); + int expired = 1; + if (DateUtils.isDateBefore(cs.getValidEndDate())) { + expired = 0; + } + cs.setExpired(expired); } } else { pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index 342a24c4f..4a612bbd6 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -7,10 +7,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 日期处理 @@ -137,6 +134,20 @@ public class DateUtils { } } + /** + * 时间比较 系统时间早于输入时间 + * + * @param date2 + * @return + */ + public static boolean isDateBefore(Date date2) { + if(Objects.isNull(date2)) return false ; + // 获得系统时间 + Date date1 = new Date(); + DateFormat df = DateFormat.getDateTimeInstance(); + return date1.before(date2); + } + /** * 系统时间晚于输入时间 * diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index c1b3f51aa..858da37e1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -97,7 +97,6 @@ and cs.send_sms = #{sendSms} - order by ${sortColumns}