diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 1f1a4b859..0aefbb3bd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -239,6 +239,8 @@ public interface OrderBasicInfoService{ */ List getIndexOrderInfo(IndexQueryDTO dto); + List getUnpaidOrderList(String startTime, String endTime); + /** * 获取超过15分钟的待支付状态订单 * @return diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 9a2b6b808..dc02ad8b1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2112,6 +2112,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { return resultList; } + /** + * 根据时间范围查询 未支付订单 + * @param startTime + * @param endTime + * @return + */ + @Override + public List getUnpaidOrderList(String startTime, String endTime) { + List list = orderBasicInfoMapper.getUnpaidOrderList(startTime, endTime); + return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList(); + } + /** * 获取超过15分钟的待支付状态订单 * @@ -2119,10 +2131,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { */ @Override public List getUnpaidOrderListOver15Min() { - String startString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date()); - String endString = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinute(new Date(), -15)); - List list = orderBasicInfoMapper.getUnpaidOrderList(startString, endString); - return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList(); + String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addMinute(new Date(), -15)); + String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date()); + // List list = orderBasicInfoMapper.getUnpaidOrderList(startString, endString); + // return CollectionUtils.isNotEmpty(list) ? list : Lists.newArrayList(); + return getUnpaidOrderList(startTime, endTime); } /**