Bladeren bron

查询惯用路线

chenxiaofei 1 maand geleden
bovenliggende
commit
c6dca087b6

+ 1 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3469,7 +3469,7 @@ public class KwtAcceptCarriageOrderService {
         kwtLogisticsOrder.setTotalLoadAmount(decimal);
         kwtLogisticsOrder.setPayment(x.getPayment());
         kwtLogisticsOrder.setRemark(x.getRemark());
-        kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.PENDING_ORDER.getCode());
+        kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.WAIT_DELIVERY.getCode());
         kwtLogisticsOrder.setCreateBy(orderDTO.getUserId());
         Date date = new Date();
         kwtLogisticsOrder.setCreateTime(date);

+ 6 - 6
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -1041,20 +1041,20 @@ public class kwfTruckTraceService {
     }
     @NotNull
     private static Date getEndDate(String date) {
-        Date startDate;
+        Date endDate;
         if (StringUtils.isBlank(date)) {
-            startDate = DateUtils.getEndOfDay(new Date());
+            endDate = DateUtils.getEndOfDay(new Date());
         } else {
             try {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                startDate = sdf.parse(date);
-                startDate = DateUtils.getEndOfDay(startDate);
+                endDate = sdf.parse(date);
+                endDate = DateUtils.getEndOfDay(endDate);
             } catch (Exception e) {
                 log.error("解析开始日期失败", e);
-                startDate = DateUtils.getEndOfDay(new Date());
+                endDate = DateUtils.getEndOfDay(new Date());
             }
         }
-        return startDate;
+        return endDate;
     }
 
     /**