feat: 批量订单导入；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/dto/JDOrderDTO.java

@@ -95,16 +95,16 @@ public class JDOrderDTO implements Serializable {
 
     /** 上门取件开始时间 */
 //    @DateTimeFormat("yyyy-MM-dd HH:00:00")
-    @ExcelProperty(value = "上门取件开始时间", order = 10, format = "TEXT")
-    @ColumnWidth(30)
+//    @ExcelProperty(value = "上门取件开始时间", order = 10, format = "TEXT")
+//    @ColumnWidth(30)
     private String sendStartTime;
 
     private Date pickupStartTime;
 
     /** 上门取件结束时间 */
 //    @DateTimeFormat("yyyy-MM-dd HH:00:00")
-    @ExcelProperty(value = "上门取件结束时间", order = 11, format = "TEXT")
-    @ColumnWidth(30)
+//    @ExcelProperty(value = "上门取件结束时间", order = 11, format = "TEXT")
+//    @ColumnWidth(30)
     private String sendEndTime;
 
     private Date pickupEndTime;

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -584,22 +584,22 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         }
 
         // 校验取件时间
-        if (dto.getSendStartTime() == null || dto.getSendEndTime() == null) {
-            errorMsg.append("上门取件开始时间和结束时间不能为空;");
-        }
-        try {
-            dto.setPickupStartTime(DateUtils.parseDate(dto.getSendStartTime(), "yyyy-MM-dd HH:mm:ss"));
-        } catch (ParseException e) {
-            errorMsg.append("上门取件开始时间格式不正确");
-        }
-        try {
-            dto.setPickupEndTime(DateUtils.parseDate(dto.getSendEndTime(), "yyyy-MM-dd HH:mm:ss"));
-        } catch (ParseException e) {
-            errorMsg.append("上门取件开始时间格式不正确");
-        }
-        if (dto.getPickupStartTime().getTime() > dto.getPickupEndTime().getTime()) {
-            errorMsg.append("上门取件开始时间不能大于上门取件结束时间;");
-        }
+//        if (dto.getSendStartTime() == null || dto.getSendEndTime() == null) {
+//            errorMsg.append("上门取件开始时间和结束时间不能为空;");
+//        }
+//        try {
+//            dto.setPickupStartTime(DateUtils.parseDate(dto.getSendStartTime(), "yyyy-MM-dd HH:mm:ss"));
+//        } catch (ParseException e) {
+//            errorMsg.append("上门取件开始时间格式不正确");
+//        }
+//        try {
+//            dto.setPickupEndTime(DateUtils.parseDate(dto.getSendEndTime(), "yyyy-MM-dd HH:mm:ss"));
+//        } catch (ParseException e) {
+//            errorMsg.append("上门取件开始时间格式不正确");
+//        }
+//        if (dto.getPickupStartTime().getTime() > dto.getPickupEndTime().getTime()) {
+//            errorMsg.append("上门取件开始时间不能大于上门取件结束时间;");
+//        }
 
         // 校验产品类型
         if (StringUtils.isBlank(dto.getProductCode())) {
@@ -946,8 +946,21 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
         bizWaybillOrder.setGoodsQty(dto.getGoodsQty());
         
         // 取件时间
-        bizWaybillOrder.setSendStartTime(DateUtils.parseDate(dto.getSendStartTime()));
-        bizWaybillOrder.setSendEndTime(DateUtils.parseDate(dto.getSendEndTime()));
+        //结束时间需要计算出来
+        LocalDateTime now = LocalDateTime.now();
+        // 先整点归零
+        LocalDateTime hourStart = now.withMinute(0).withSecond(0).withNano(0);
+        // 下一个整点
+        LocalDateTime nextHour = hourStart.plusHours(1);
+        // 结束再+1
+        LocalDateTime endHour = nextHour.plusHours(1);
+        // 转Date给你原有字段用
+        Date startTime = Date.from(nextHour.atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(endHour.atZone(ZoneId.systemDefault()).toInstant());
+        bizWaybillOrder.setSendStartTime(startTime);
+        bizWaybillOrder.setSendEndTime(endTime);
+//        bizWaybillOrder.setSendStartTime(DateUtils.parseDate(dto.getSendStartTime()));
+//        bizWaybillOrder.setSendEndTime(DateUtils.parseDate(dto.getSendEndTime()));
         
         // 产品信息和增值服务
         bizWaybillOrder.setProductCode(dto.getProductCode());