注释

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

@@ -262,7 +262,9 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
 
         try {
             AjaxMessage ajaxMessage = new AjaxMessage(ResultStatus.OK);
+            //从pay_amount_waterusedamount 获取水量信息
             AmountWaterUsedAmount amountWaterUsedAmount = amountWaterUsedAmountMapper.get(id,loginUser.getCustomerId(),loginUser.getSiteId());
+            //判断是否审核 1未审核
             if (amountWaterUsedAmount != null && amountWaterUsedAmount.getState() == 1) {
                 BigDecimal amount = amountWaterUsedAmount.getPayamount();
                 Integer yearAmount = amountWaterUsedAmount.getYear();
@@ -271,15 +273,20 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                     ajaxMessage.setMsg(ResultStatus.AMOUNT__REVIEW_ERROR_CLOSINGACCOUNT);
                     return ajaxMessage;
                 }*/
+                //水量
                 if(amount!=null){
                     int status = 2;//审核状态；1:待审核，2：已审核
                     Integer isEnable = 1; //阶梯类型
                     int flag = 0;//可用量修改标识
                     int debtFlag = 1; //欠费
+                    //客户信息
                     PayBaseAccount payBaseAccount = payBaseAccountMapper.get(amountWaterUsedAmount.getAccountId());
                     debtFlag =payBaseAccount.getState();
+                    //账期
                     String  payItemName =  amountWaterUsedAmount.getYear() + "年" + amountWaterUsedAmount.getMonth() + "月";
+                    //流水号
                     String transNo = Util.getBatchNo("C",amountWaterUsedAmount.getMetercode());
+                   //开户信息
                     PayBaseCustomerandmeterrela customerInfo = payBaseCustomerandmeterrelaMapper.get(amountWaterUsedAmount.getCustomerandmeterrelaId());
                     Integer calculateway = customerInfo.getCalculateway();//结算方式
                     // 0水量 不计费但计量
@@ -298,11 +305,15 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                             isEnable = 0;
                         }
                     }
+
                     //月阶梯用户 新安装户相差天数>31天或者跨账期结算则非阶梯结算
                     if(isEnable>=1){
+
                         List<AmountWaterUsedAmountDto> amountWaterUsedAmounts = amountWaterUsedAmountMapper.getWaterUsedAmountByMeterId(customerInfo.getWatermeterId());
+                        //查询所有水量信息
                         if(amountWaterUsedAmounts!=null && amountWaterUsedAmounts.size()>0){
                             AmountWaterUsedAmountDto theLastOne = null;
+
                             if(amountWaterUsedAmounts.size()>1){
                                 //取最后一次已审核
                                 theLastOne = amountWaterUsedAmounts.get(1);
@@ -311,6 +322,7 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                                     if(amountWaterUsedAmount.getMonth()-theLastOne.getMonth()>1){
                                         isEnable =0;
                                     }
+
                                 }else if((amountWaterUsedAmount.getYear() - theLastOne.getYear()) == 1){
                                     if((amountWaterUsedAmount.getMonth()!= 1||theLastOne.getMonth()!= 12)){
                                         isEnable =0;
@@ -408,7 +420,7 @@ public class AmountWaterUsedAmountServiceImpl implements AmountWaterUsedAmountSe
                             result = this.autoPayFee(amountWaterUsedAmount,loginUser);
                         }
                     }
-
+                    //欠费了标记
                     if(flag > 0 || result == 2) {
                         if(result==2)
                             debtFlag = result;

smart-city-platform/src/main/resources/mapper/pay/AmountWaterUsedAmountMapper.xml

@@ -142,7 +142,7 @@
 		from sc_device w
 		left join pay_amount_waterusedamount a on a.watermeter_id = w.id
    		 where w.id = #{waterMeterId}
-		order by a.year desc,a.month desc
+		order by a.year desc,a.month desc limit 2
 	</select>