修改本期应收明细bug、账单详情bug、实收信息问题

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayFeeMapper.java

@@ -38,7 +38,7 @@ public interface PayFeeMapper {
 
     PayfeeDetaileBill getPayfeeDetaileBill(@Param("accountId") BigInteger accountId);
 
-    PayfeeDetailed getPayfeeDetailed(@Param("accountId")BigInteger accountId ,@Param("year")Integer year ,@Param("month")Integer month);
+    PayfeeDetailed getPayfeeDetailed(@Param("accountId")BigInteger accountId);
 
     List<PayfeeReceivableInfo> getPayreceivableDebt(@Param("accountId")BigInteger accountId , @Param("year")Integer year);
 

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayInvoiceDto.java

@@ -31,7 +31,7 @@ public class PayInvoiceDto {
     private String accountname;
     @ApiModelProperty(value = "开票金额")
     private String invoiceamount;
-    @ApiModelProperty(value = "票据状态,2已使用，3作废")
+    @ApiModelProperty(value = "票据状态,2正常，3作废")
     private Integer state;
     @ApiModelProperty(value = "票据状态")
     private String stateLabel;

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PayfeeReceivedInfo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigInteger;
 import java.time.LocalDateTime;
 
 /**
@@ -54,6 +55,6 @@ public class PayfeeReceivedInfo {
     @ApiModelProperty(value = "作废人")
     private String cancelperson;
     @ApiModelProperty(value = "收据id")
-    private String invoiceId;
+    private BigInteger invoiceId;
 
 }

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

@@ -771,10 +771,10 @@ public class PayFeeServiceImp implements PayFeeService {
         if(id == null){
             return new PayfeeDetailed();
         }
-        LoginUser loginUser = UserUtil.getCurrentUser();
-        //获取最新账期
-        BaseClosingAccountInfoDto baseClosingAccountInfoDto=baseClosingAccountInfoMapper.getLastClosingAccount(loginUser.getSiteId(),loginUser.getCustomerId());
-       return  payFeeMapper.getPayfeeDetailed(id,baseClosingAccountInfoDto.getYear(),baseClosingAccountInfoDto.getMonth());
+//        LoginUser loginUser = UserUtil.getCurrentUser();
+//        //获取最新账期
+//        BaseClosingAccountInfoDto baseClosingAccountInfoDto=baseClosingAccountInfoMapper.getLastClosingAccount(loginUser.getSiteId(),loginUser.getCustomerId());
+       return  payFeeMapper.getPayfeeDetailed(id);
     }
 
     /**

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

@@ -141,8 +141,8 @@
     <select id="getPayfeeDetaileBill" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeDetaileBill">
         select
             sum(debt) debt ,
-            sum(debt)-(select remaining from pay_pay_rechargeaccount where account_id=#{accountId}) as "waterFee",
-            (select remaining from pay_pay_rechargeaccount where account_id=#{accountId})-sum(debt) as "receivableFee"
+            sum(debt)-(select remaining from pay_pay_rechargeaccount where account_id=#{accountId}) as "receivableFee",
+            (select remaining from pay_pay_rechargeaccount where account_id=#{accountId})-sum(debt) as "waterFee"
         from pay_pay_receivable
         where debt>0
         and account_id=#{accountId}
@@ -161,7 +161,6 @@
         from pay_pay_receivable
         where debt>0
         and account_id=#{accountId}
-        and `year`= #{year} and `month`=#{month}
         group by  account_id
     </select>