解决时间修改冲突

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2421,8 +2421,7 @@ public class OrderServiceImpl implements Orderservice {
             orderConditionsReq.setUserId(userId);
             Date startDate = DateUtil.convert2Date(DateUtil.addDays(new Date(),-10), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
-
-            orderConditionsReq.setEndTimestamp(DateUtil.convert2Date(new Date(),"yyyy-MM-dd HH:mm:ss").getTime()/1000);
+            orderConditionsReq.setEndTimestamp(new Date().getTime()/1000);
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());
             if (!String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoReqs.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode());
@@ -2448,11 +2447,10 @@ public class OrderServiceImpl implements Orderservice {
                     }
                     queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                     queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
-                    queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
+                       queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                     SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //设置格式
                     String sd = format.format(new Date(Long.valueOf(orderBean.getCreateTime())*1000));
-                    queryOrderByConditionsResponseVo.setCreateTime(sd);
-                    return queryOrderByConditionsResponseVo;
+                    queryOrderByConditionsResponseVo.setCreateTime(sd);                    return queryOrderByConditionsResponseVo;
                 }
             ).collect(Collectors.toList());
         } catch (Exception e) {