1水量审核

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

@@ -267,6 +267,14 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                         amount = customerInfo.getFixedamount();
                     }
 
+                    BigInteger WaterPropertyId = customerInfo.getWaterPropertyId();
+                    if(WaterPropertyId != null){
+                        //根据用水性质ID查找是否是阶梯
+                        BaseWaterPropertyDto waterPropertyDto = baseWaterPropertyMapper.get(WaterPropertyId,loginUser.getSiteId(),loginUser.getCustomerId());
+                        Integer laddertype = waterPropertyDto.getLaddertype();
+                        isEnable = laddertype;
+                    }
+
                     //月阶梯用户 新安装户相差天数>31天或者跨账期结算则非阶梯结算
                     if(isEnable>=1){
                         List<AmountWaterUsedAmountDto> amountWaterUsedAmounts = amountWaterUsedAmountMapper.getWaterUsedAmountByMeterId(customerInfo.getWatermeterId());
@@ -304,15 +312,7 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                             }
                         }
                     }
-                    BigInteger WaterPropertyId = customerInfo.getWaterPropertyId();
-                    if(WaterPropertyId != null){
-                        //根据用水性质ID查找是否是阶梯
-                        BaseWaterPropertyDto waterPropertyDto = baseWaterPropertyMapper.get(WaterPropertyId,loginUser.getSiteId(),loginUser.getCustomerId());
-                        Integer laddertype = waterPropertyDto.getLaddertype();
-                        if(laddertype != null && laddertype == 0){
-                            isEnable = 0;
-                        }
-                    }
+
                     //计算欠费
                     if (isEnable==0) {
                         //非阶梯