缴费开阀修改

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayFeeServiceImp.java

@@ -313,7 +313,9 @@ public class PayFeeServiceImp implements PayFeeService {
         //查询阀门状态，判断是否需要开阀
         List<PayValveStateInfo> payValveStateInfos = payFeeMapper.getDeviceValveState(new BigInteger(id));
         for(PayValveStateInfo payValveStateInfo : payValveStateInfos){
-            if(payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1 && payValveStateInfo.getValveState().equals("0")){
+            if(payValveStateInfo != null
+                    && payValveStateInfo.getDebt()!= null && payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1
+                    && payValveStateInfo.getValveState()!= null && payValveStateInfo.getValveState().equals("0")){
                 Boolean sendValveCommondResult = this.sendValveCommond(payValveStateInfo);
                 if(!sendValveCommondResult){
 //                    result+="; 开阀异常："+String.format("%.2f", transAmount)+"元";
@@ -574,7 +576,9 @@ public class PayFeeServiceImp implements PayFeeService {
        //查询阀门状态，判断是否需要开阀
        List<PayValveStateInfo> payValveStateInfos = payFeeMapper.getDeviceValveState(payCustomRechargeDto.getAccountId());
        for(PayValveStateInfo payValveStateInfo : payValveStateInfos){
-           if(payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1 && payValveStateInfo.getValveState().equals("0")){
+           if(payValveStateInfo != null
+                   && payValveStateInfo.getDebt()!= null && payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1
+                   && payValveStateInfo.getValveState()!= null && payValveStateInfo.getValveState().equals("0")){
                Boolean sendValveCommondResult = this.sendValveCommond(payValveStateInfo);
                if(!sendValveCommondResult){
 //                    result+="; 开阀异常："+String.format("%.2f", transAmount)+"元";
@@ -1240,7 +1244,9 @@ public class PayFeeServiceImp implements PayFeeService {
         //查询阀门状态，判断是否需要开阀
         List<PayValveStateInfo> payValveStateInfos = payFeeMapper.getDeviceValveState(payCustomRechargeDto.getAccountId());
         for(PayValveStateInfo payValveStateInfo : payValveStateInfos){
-            if(payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1 && payValveStateInfo.getValveState().equals("0")){
+            if(payValveStateInfo != null
+                    && payValveStateInfo.getDebt()!= null && payValveStateInfo.getDebt().compareTo(BigDecimal.ZERO) ==1
+                    && payValveStateInfo.getValveState()!= null && payValveStateInfo.getValveState().equals("0")){
                 Boolean sendValveCommondResult = this.sendValveCommond(payValveStateInfo);
                 if(!sendValveCommondResult){    //关阀失败
 //                    result+="; 开阀异常："+String.format("%.2f", transAmount)+"元";