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

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

@@ -531,11 +531,11 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
 
         //判断是否出险
         String EscNum = "";
-        if(odr1009Response.getResult().getRiskRatio().getJqPreEscNum() > 0)
+        if(odr1009Response.getResult().getRiskRatio().getJqPreEscNum() != null && odr1009Response.getResult().getRiskRatio().getJqPreEscNum() > 0)
         {
             EscNum += "交强险出险次数:" + odr1009Response.getResult().getRiskRatio().getJqPreEscNum()+"次  ";
         }
-        if(odr1009Response.getResult().getRiskRatio().getSyPreEscNum() > 0){
+        if(odr1009Response.getResult().getRiskRatio().getSyPreEscNum() != null && odr1009Response.getResult().getRiskRatio().getSyPreEscNum() > 0){
             EscNum += "商业险出险次数:" + odr1009Response.getResult().getRiskRatio().getSyPreEscNum() + "次";
         }
         quoteRespVo.setAccidentInfoStr(EscNum);

src/main/resources/application.yml

@@ -19,7 +19,7 @@ logging:
     # 设置 MyBatis 执行 sql 时打印具体的 Sql 语句
     com.hahashujia.logback: DEBUG
     org.mybatis: DEBUG
-  path: /ins/logs
+  path: /nasData/ins/logs