From 97e40810dcdc8bfcb853c5e8b3e4e053f93cf591 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 6 Nov 2023 15:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hfkj/schedule/TradeOrderSchedule.java | 2 +- .../java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java b/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java index 5bb99c0..6be8e60 100644 --- a/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java +++ b/schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java @@ -60,7 +60,7 @@ public class TradeOrderSchedule { createTime.add(Calendar.MINUTE, -10); Map param = new HashMap<>(); - param.put("createTimeS", createTime.getTimeInMillis()); + param.put("createTimeE", createTime.getTimeInMillis()); param.put("status", TradeOrderStatusEnum.status1.getNumber()); param.put("createType", TradeOrderCreateTypeEnum.type1.getCode()); List orderList = tradeOrderService.getTradeOrderList(param); diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java index 6647d14..b30750c 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java @@ -582,6 +582,10 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { criteria.andCreateTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeS"))); } + if (MapUtils.getLong(param, "createTimeE") != null) { + criteria.andCreateTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "createTimeE"))); + } + if (MapUtils.getLong(param, "payTimeS") != null) { criteria.andPayTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "payTimeS"))); }