diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
index b92595743..d2ba2213f 100644
--- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
+++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
@@ -31,8 +31,8 @@ public class OrderExpiringSchedule {
WxOrderService wxOrderService;
- @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次
- //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
+ //@Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次
+ @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
public void orderExpireSchedule() {
Map dateMap = new HashMap();
diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
index c0bb770ed..4317a72f9 100644
--- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
@@ -135,10 +135,10 @@
AND type = #{type,jdbcType=TINYINT}
- AND `create_date` > #{startDate,jdbcType=TIMESTAMP}
+ AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP})
- AND `create_date` < #{endDate,jdbcType=TIMESTAMP}
+ AND unix_timestamp(`create_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP})
@@ -146,15 +146,15 @@
select
from wx_order
- where order_status = 7 and press_end_date is not null
+ where press_end_date is not null and (order_status = 6 or order_status = 7)
AND type = #{type,jdbcType=TINYINT}
- AND `create_date` > #{startDate,jdbcType=TIMESTAMP}
+ AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP})
- AND `press_end_date` < #{endDate,jdbcType=TIMESTAMP}
+ AND unix_timestamp(`press_end_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP})