From 0d0c668b03afa704898a8a6f79c1faf15d59cd28 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 1 Jun 2021 15:24:09 +0800 Subject: [PATCH] tt --- .../com/iformall/mapper/TtOrderMapper.java | 2 ++ .../iformall/service/tt/TtOrderService.java | 2 +- .../service/tt/impl/TtOrderServiceImpl.java | 4 +-- .../main/resources/mapper/TtOrderMapper.xml | 8 ++++- .../iformall/controller/BaseController.java | 6 +++- .../controller/TtUserGrantController.java | 4 ++- .../interceptor/AuthorizationInterceptor.java | 7 +++- .../schedule/TtOrderExpiringSchedule.java | 34 +++++++++---------- 8 files changed, 42 insertions(+), 25 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java index b620bba0d..c3f3bd374 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtOrderMapper.java @@ -22,6 +22,8 @@ public interface TtOrderMapper extends CommonMapper { Integer findListCount(TtOrder orderQ); // int updateExpire(@Param("expireDate")Date expireDate,@Param("orderStatus") Integer orderStatus); + List findExpireIdList(@Param("beforeDate")Date beforeDate,@Param("orderStatus") Integer orderStatus); + List findBeforeIdList(@Param("beforeDate")Date beforeDate,@Param("orderStatus") Integer orderStatus,@Param("isRecorded") Integer isRecorded); diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java index 3e465d25b..78412687b 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java @@ -39,7 +39,7 @@ public interface TtOrderService { boolean isByMember(Long memberId, Long id); - List findExpireIdList(Date expireDate); + List findExpireIdList(Date expireDate); List findRecordedIdList(Date recordedDate); diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 4a6cd966e..19766b1f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -389,8 +389,8 @@ public class TtOrderServiceImpl implements TtOrderService { } @Override - public List findExpireIdList(Date expireDate) { - return ttOrderMapper.findBeforeIdList(expireDate,EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode(),null); + public List findExpireIdList(Date expireDate) { + return ttOrderMapper.findExpireIdList(expireDate,EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); } @Override diff --git a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml index 89c828b7e..7b6ccb566 100644 --- a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml @@ -251,7 +251,13 @@ - + select `id`,`tenant_id`,`parent_tenant_id`,order_status,create_date + from tt_order + where order_status=#{orderStatus} and create_date <= #{beforeDate} + + +