商业险重复投保问题

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -595,30 +595,17 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             }
 
             //终保日期
-            String coverageEndDate = ciMsg.substring(ciMsg.indexOf("终保日期") + 5, ciMsg.indexOf("终保日期") + 5 + 12);
-
-            LocalDateTime start = DateTimeUtil.parseLocalDateTime(coverageEndDate,
-                    DateTimeUtil.UNSIGNED_DATETIME_PATTERN_EXT1);
-            LocalDateTime end = start.plusYears(1L).minusDays(1L);
-
-            String newStartDate = "";
-            String newEndDate = "";
-            //判断是否是及时起保
-            if (start.getHour() > 0 || start.getMinute() > 0 || start.getSecond() > 0) {
-                newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
-                end = end.plusDays(1L);
-                newEndDate = DateTimeUtil.getStartTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
-            } else {
-                newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
-                newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
-            }
+            TimeEntity timeEntity = getRepeatStartEndTime(ciMsg, SY_REGEX);
 
+            if(ObjectUtils.isEmpty(timeEntity)){
+                return false;
+            }
 
-            System.err.println("商业新起：" + newStartDate);
-            System.err.println("商业新止：" + newEndDate);
+            System.err.println("商业新起：" + timeEntity.getNewStartDate());
+            System.err.println("商业新止：" + timeEntity.getCoverageEndDate());
 
-            m.getRequestLabel().getCondition().getBase().setTInsrncBgnTmSY(newStartDate);
-            m.getRequestLabel().getCondition().getBase().setTInsrncEndTmSY(newEndDate);
+            m.getRequestLabel().getCondition().getBase().setTInsrncBgnTmSY(timeEntity.getNewStartDate());
+            m.getRequestLabel().getCondition().getBase().setTInsrncEndTmSY(timeEntity.getCoverageEndDate());
 
             //转保信息清空  重新报价
             m.getRequestLabel().getCondition().getVhl().setCBusType("0");