Merge branch 'refs/heads/master-20240326' into test

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

@@ -420,11 +420,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             String newStartDate = "";
             String newEndDate = "";
             //判断是否是及时起保
-            if(start.getHour() > 0 || start.getMinute() > 0 || start.getSecond() > 0){
+            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{
+            } else {
                 newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
                 newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
             }
@@ -505,7 +505,9 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             //截取0 到 机动车交通事故强制险
             String ciMsg = tfiWarnData.getWarnMessage();
             requestInfoList.add(ciMsg);
-            if (ciMsg.contains("终保日期： 以上为所有结果信息")) return true;
+            if (ciMsg.contains("终保日期： 以上为所有结果信息")) {
+                throw new SystemException("商业险平台返回:" + ciMsg);
+            }
 
             //终保日期
             String coverageEndDate = ciMsg.substring(ciMsg.indexOf("终保日期") + 5, ciMsg.indexOf("终保日期") + 5 + 12);
@@ -516,11 +518,11 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             String newStartDate = "";
             String newEndDate = "";
             //判断是否是及时起保
-            if(start.getHour() > 0 || start.getMinute() > 0 || start.getSecond() > 0){
+            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{
+            } else {
                 newStartDate = DateTimeUtil.getStartTimeOfDayStr(start, DateTimeUtil.DATETIME_PATTERN);
                 newEndDate = DateTimeUtil.getEndTimeOfDayStr(end, DateTimeUtil.DATETIME_PATTERN);
             }
@@ -758,7 +760,6 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
      */
 
 
-
     @Override
     public HttpResult callbackAnOrder(String quoteOrderNo) {
 
@@ -1363,14 +1364,13 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     }
 
-     /**
-     * @Description  更新订单状态和支付时间
-     * @Author  xingming
-     * @Date   2024/3/28 16:55
+    /**
+     * @Description 更新订单状态和支付时间
+     * @Author xingming
+     * @Date 2024/3/28 16:55
      * @Param
      * @Return
      * @Exception
-     *
      */
     @Override
     public void callbackAnOrderNew(String insAreaCompanyId) {
@@ -1398,7 +1398,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                     iac = buildCallBack(iac, param);
                 }
                 //设置支付时间
-                if(iac.getPayDate()==null){
+                if (iac.getPayDate() == null) {
                     iac.setPayDate(LocalDateTime.now());
                 }
                 log.info("变更前订单状态：" + order.getOrderstatus());