Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/OrderServiceImpl.java

@@ -40,7 +40,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     private OrderMapper orderMapper;
     //有赞客户端
     DefaultYZClient yzClient = new DefaultYZClient();
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     Date startCreatedDate = null;
     Date endCreatedDate = null;
     Date startUpdateDate = null;
@@ -65,9 +65,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
 //            startCreatedDate = sdf.parse("2021-01-28 11:04:01");
 //            endCreatedDate = sdf.parse("2021-03-1 16:39:59");
             //当前时间的前1分钟
-            startCreatedDate = sdf.parse(sdf.format(new Date(date.getTime()-(long) 60*1000)));
+            startCreatedDate = sdf.parse(sdf.format(new Date(date.getTime()-(long) 5*60*1000)));
             log.info("订单创建开始时间"+sdf.format(startCreatedDate));
             endCreatedDate = sdf.parse(sdf.format(date));
+            String format = sdf.format(date);
             log.info("订单创建结束时间"+sdf.format(endCreatedDate));
         } catch (ParseException e) {
             e.printStackTrace();