From b109bfc3010d704b47de4e6f80033f8f6552cf61 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 20 Mar 2019 10:19:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=94=AF=E4=BB=98=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B41=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/schedule/OrderExpiringSchedule.java | 2 +- .../src/main/java/com/iformall/mapper/WxOrderMapper.java | 2 +- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 7f29757d4..1419d360d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -72,7 +72,7 @@ public class OrderExpiringSchedule { Date pressExpireDate = new Date(curDate.getTime() - PRESS_TIME_OUT ); dateMap.put("type", EnumOrderType.COUPON.getCode()); dateMap.put("endDate", pressExpireDate); - List orderPresss = wxOrderMapper.findListOfUnCompletePressOrderByDate(dateMap); + List orderPresss = wxOrderMapper.findListOfCompleteUnPaidPressOrderByDate(dateMap); orderPresss.stream().forEach( o -> { try { orderPressExpired(o); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index bc8f3475c..9a39930a5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -17,7 +17,7 @@ public interface WxOrderMapper extends CommonMapper { List findListOfUnpaidOrderByDate(Map dateMap); List findListOfUnpaidPressOrderByDate(Map dateMap); - List findListOfUnCompletePressOrderByDate(Map dateMap); + List findListOfCompleteUnPaidPressOrderByDate(Map dateMap); List findListOfCUser(WxOrder wxOrder); WxOrderCouponVo selectDetailOfCUser(WxOrder wxOrder); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index a3978b90b..1f591b917 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -164,11 +164,11 @@ - select from wx_order - where press_end_date is not null and order_status = 6 + where press_end_date is not null and order_status = 7 AND type = #{type,jdbcType=TINYINT} @@ -176,7 +176,7 @@ AND unix_timestamp(`create_date`) > unix_timestamp(#{startDate,jdbcType=TIMESTAMP}) - AND unix_timestamp(`press_end_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP}) + AND unix_timestamp(`update_date`) < unix_timestamp(#{endDate,jdbcType=TIMESTAMP})