报价历史bug

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

@@ -245,13 +245,34 @@ public class CostsCalServiceImpl implements CostsCalcService {
     @Override
     public SubOrderExportFeeVo getExportFee(InsFeeOrderNew insFeeOrderNew) {
         SubOrderExportFeeVo subOrderExportFeeVo = new SubOrderExportFeeVo();
-        subOrderExportFeeVo.setJqExportCosts(insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setSyExportCosts(insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setNoExportCosts(insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setJqExportRadio(insFeeOrderNew.getJqCostsExportProportion().add(insFeeOrderNew.getJqExportOtherCostsProportion()));
-        subOrderExportFeeVo.setSyExportRadio(insFeeOrderNew.getSyCostsExportProportion().add(insFeeOrderNew.getSyExportOtherCostsProportion()));
-        subOrderExportFeeVo.setNoExportRadio(insFeeOrderNew.getNoCostsExportProportion().add(insFeeOrderNew.getNoExportOtherCostsProportion()));
+        if(!Objects.isNull(insFeeOrderNew)) {
+            if (insFeeOrderNew.getJqExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setJqExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getJqExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setJqExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getSyExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setSyExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getSyExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setSyExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getNoExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setNoExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getNoExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setNoExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            subOrderExportFeeVo.setJqExportCosts(insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setSyExportCosts(insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setNoExportCosts(insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setJqExportRadio(insFeeOrderNew.getJqCostsExportProportion().add(insFeeOrderNew.getJqExportOtherCostsProportion()));
+            subOrderExportFeeVo.setSyExportRadio(insFeeOrderNew.getSyCostsExportProportion().add(insFeeOrderNew.getSyExportOtherCostsProportion()));
+            subOrderExportFeeVo.setNoExportRadio(insFeeOrderNew.getNoCostsExportProportion().add(insFeeOrderNew.getNoExportOtherCostsProportion()));
 
-        return subOrderExportFeeVo;
+            return subOrderExportFeeVo;
+        }
+        return new SubOrderExportFeeVo();
     }
 }

src/main/java/com/ydtech/modules/order/entity/vo/SubOrderExportFeeVo.java

@@ -28,4 +28,13 @@ public class SubOrderExportFeeVo {
 
     @ApiModelProperty("非车出口比例")
     private BigDecimal noExportRadio;
+
+    public SubOrderExportFeeVo(){
+        this.jqExportCosts = BigDecimal.ZERO;
+        this.syExportCosts = BigDecimal.ZERO;
+        this.noExportCosts = BigDecimal.ZERO;
+        this.jqExportRadio = BigDecimal.ZERO;
+        this.syExportRadio = BigDecimal.ZERO;
+        this.noExportRadio = BigDecimal.ZERO;
+    }
 }