解决冲突

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

@@ -2419,7 +2419,7 @@ public class OrderServiceImpl implements Orderservice {
             OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
             BeanUtil.convertBean(queryOrderByConditionsRequestVo, orderConditionsReq);
             orderConditionsReq.setUserId(userId);
-            Date startDate = DateUtil.convert2Date(DateUtil.addDays(new Date(),-10), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            Date startDate = DateUtil.convert2Date(DateUtil.addDays(new Date(),-28), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderConditionsReq.setStartTimestamp(startDate.getTime()/1000);
             orderConditionsReq.setEndTimestamp(new Date().getTime()/1000);
             BaseDownLoadResponse<List<OrderInfoReqs>> orderInfoReqs = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq,LogTreadLocal.getTrackingNo());
@@ -2445,13 +2445,12 @@ public class OrderServiceImpl implements Orderservice {
                             imgUrl = Arrays.asList(imgUrls.split(","));
                         }
                     }
-                    queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
-                    queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
                        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.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
+                    SimpleDateFormat sdff=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    String sd = sdff.format(new Date(Long.valueOf(orderBean.getCreateTime())));
+                    queryOrderByConditionsResponseVo.setCreateTime(sd);
+                    return queryOrderByConditionsResponseVo;                }
             ).collect(Collectors.toList());
         } catch (Exception e) {
             LogUtil.error("queryOrders_error", gson.toJson(queryOrderByConditionsRequestVo), e);
@@ -2459,4 +2458,5 @@ public class OrderServiceImpl implements Orderservice {
         }
         return ResponseUtil.success(responseVos);
     }
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderAffirmReq.java

@@ -20,6 +20,8 @@ import java.util.List;
 @ToString
 public class ParkingOrderAffirmReq {
 
+    private String appId;
+
    /*** "订单号"***/
     private String orderCode;