修改代码

src/main/java/com/ydtech/modules/fee/service/impl/CostsCalServiceImpl.java

@@ -244,6 +244,7 @@ public class CostsCalServiceImpl implements CostsCalcService {
 
     @Override
     public SubOrderExportFeeVo getExportFee(InsFeeOrderNew insFeeOrderNew) {
+
         SubOrderExportFeeVo subOrderExportFeeVo = new SubOrderExportFeeVo();
         if(!Objects.isNull(insFeeOrderNew)) {
             if (insFeeOrderNew.getJqExportSuperviseCostsPremiums() == null) {

src/main/java/com/ydtech/modules/ins/model/vo/RiskInfoVo.java

@@ -37,10 +37,10 @@ public class RiskInfoVo {
 
     public void expirationTime() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(endDate, formatter);
+        LocalDateTime dateTime = LocalDateTime.parse(startDate, formatter);
         LocalDateTime now = LocalDateTime.now();
         int i = now.compareTo(dateTime);
-        if (i > 0) {
+        if (i < 0) {
             long days = Duration.between(now, dateTime).toDays();
             this.expirationDay = String.valueOf(days);
         }else {

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -189,16 +189,18 @@ public class InsOrdersController extends BaseController {
             insAreaCompanyHistoryVo.setUserName(insOrders.getUsername());
             insAreaCompanyHistoryVo.setUserId(insOrders.getUserid());
             InsFeeOrderNew insFeeOrderNew = insFeeOrderNewMap.get(a.getId());
-            SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
-            insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
-            insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
-            insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
-            insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
-            insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
-            insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
-            insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
-                    .add(subOrderExportFeeVo.getSyExportCosts())
-                    .add(subOrderExportFeeVo.getNoExportCosts()));
+            if (!ObjectUtils.isEmpty(insFeeOrderNew)){
+                SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
+                insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
+                insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
+                insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
+                insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
+                insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
+                insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                        .add(subOrderExportFeeVo.getSyExportCosts())
+                        .add(subOrderExportFeeVo.getNoExportCosts()));
+            }
             // 设置评分信息
             insAreaCompanyHistoryVo.setRatingInformation();
             return insAreaCompanyHistoryVo;