Merge remote-tracking branch 'origin/test' into test

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

@@ -326,14 +326,14 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             if(jqAppStatusMessage.contains("重复投保") || syAppStatusMessage.contains("重复投保")){
                 //交强重复投保
                 for(RiskInfoVo riskInfoVo : riskInfoVos){
-                    if(riskInfoVo.getRiskCode().equals(InsuranceRisk.TRAFFIC.getCode())){
+                    if(riskInfoVo.getRiskCode().equals(InsuranceRisk.TRAFFIC.getCode()) && !jqAppStatusMessage.isEmpty()){
                         String jqEndDate = getTheExpiryDate(jqAppStatusMessage, THE_FIRST_REGEX);
                         List<String> duplicateDate = getDuplicateDate(riskInfoVo.getStartDate(), riskInfoVo.getEndDate(), jqEndDate);
                         riskInfoVo.setStartDate(duplicateDate.get(0));
                         riskInfoVo.setEndDate(duplicateDate.get(1));
                     }
                     //商业重复投保
-                    if(riskInfoVo.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode())){
+                    if(riskInfoVo.getRiskCode().equals(InsuranceRisk.BUSINESS.getCode()) && !syAppStatusMessage.isEmpty()){
                         String syEndDate = getTheExpiryDate(syAppStatusMessage, THE_SECOND_REGEX);
                         List<String> duplicateDate = getDuplicateDate(riskInfoVo.getStartDate(), riskInfoVo.getEndDate(), syEndDate);
                         riskInfoVo.setStartDate(duplicateDate.get(0));