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}