Merge remote-tracking branch 'remotes/origin/202007131400' into develop

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

@@ -129,6 +129,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -138,6 +139,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -2417,9 +2419,10 @@ public class OrderServiceImpl implements Orderservice {
             OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
             BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
             orderConditionsReq.setUserId(userId);
-            Date now = new Date();
-            orderConditionsReq.setStartTimestamp(DateUtil.addMonths(now, -3).getTime()/1000);
-            orderConditionsReq.setEndTimestamp(now.getTime()/1000);
+            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);
             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());
@@ -2441,7 +2444,7 @@ public class OrderServiceImpl implements Orderservice {
                     }
                     queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                     queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
-                    queryOrderByConditionsResponseVo.setCreateTime(DateUtil.convert2Str(DateUtil.convert2Date(orderBean.getCreateTime(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+                    queryOrderByConditionsResponseVo.setCreateTime(orderBean.getCreateTime());
                     return queryOrderByConditionsResponseVo;
                 }
             ).collect(Collectors.toList());