提交代码

schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java

@@ -60,7 +60,7 @@ public class TradeOrderSchedule {
         createTime.add(Calendar.MINUTE, -10);
 
         Map<String,Object> 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<BsTradeOrder> orderList = tradeOrderService.getTradeOrderList(param);

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")));
         }