实收返回状态和支付方式

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

@@ -35,6 +35,8 @@ public class PayPayReceivedListDto extends BaseDto {
     @ApiModelProperty(example = "100.00",notes = "实收金额")
     private BigDecimal receivedamount;
     @ApiModelProperty(example = "微信支付",notes = "支付方式")
+    private String  payway;
+    @ApiModelProperty(example = "微信支付",notes = "支付方式")
     private String  paywayname;
     @ApiModelProperty(example = "入账",notes = "交易状态")
     private String  statename;

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

@@ -24,6 +24,10 @@ public class PayfeeReceivedInfo {
     private String paywayname;
     @ApiModelProperty(value = "交易状态")
     private String statename;
+    @ApiModelProperty(value = "支付方式")
+    private String payway;
+    @ApiModelProperty(value = "交易状态")
+    private String state;
     @ApiModelProperty(value = "创建日期")
     private String createDate;
     @ApiModelProperty(value = "是否作废")

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

@@ -14,7 +14,7 @@ import lombok.Data;
 public class PayfeeResult {
     @ApiModelProperty(value = "交易流水号")
     private String payseriesno;
-    @ApiModelProperty(value = "缴费类型，1缴费 2充值")
+    @ApiModelProperty(value = "缴费类型，0缴费 1充值")
     private Integer transType;
     @ApiModelProperty(value = "缴费结果信息")
     private String msg;

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

@@ -80,6 +80,8 @@
             '' as "ladderlevelname",
             rece.payseriesno as "payseriesno",
             sum(rece.receivedamount) as "receivedamount",
+            max(rece.state) as "state",
+            min(rece.payway) as "payway",
         (select label from pay_sys_dict where type = '支付方式' and value = min(rece.payway) and site_id = #{siteId} and customer_id =#{customerId}) as "paywayname",
         (select label from pay_sys_dict where type = '交易状态' and value = max(rece.state) and site_id = #{siteId} and customer_id =#{customerId}) as "statename",
             max(users.name) as "createbyname",

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

@@ -167,6 +167,8 @@
     <select id="getPayreceivableDebt" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivableInfo">
         select
             account_id as "accountId",
+            accountnumber,
+            accountname,
             year,
             month,
              CONCAT(rece.year,'年',LPAD(rece.month, 2, 0),'月费用') as "name",
@@ -180,11 +182,13 @@
         where rece.debt > 0
         and rece.account_id=#{accountId}
         and `year`=#{year}
-        group by `year`,`month`
+        group by account_id,accountnumber,accountname,`year`,`month`
     </select>
     <select id="getPayreceivableDebtDetailed" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivableInfo">
         select
             account_id as "accountId",
+            accountnumber,
+            accountname,
             year,
             month,
              rece.payitemname as "name",
@@ -208,6 +212,8 @@
 
     <select id="getPayreceivedDetailed" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivedInfo">
         select
+            accountnumber,
+            accountname,
          name as "name",
          (case when ladderlevel =  1 then '一阶'
                     when ladderlevel = 2 then '二阶'
@@ -216,6 +222,8 @@
                     else '' end) as "ladderlevelname",
          payseriesno as "payseriesno",
          receivedamount,
+         max(rece.state) as "state",
+         min(rece.payway) as "payway",
          (select label from pay_sys_dict where type = '支付方式' and value = reced.payway and site_id = #{siteId} and customer_id =#{customerId}) as "paywayname",
          (select label from pay_sys_dict where type = '交易状态' and value = reced.state and site_id = #{siteId} and customer_id =#{customerId}) as "statename",
          create_date as "createDate",
@@ -231,6 +239,8 @@
 
     <select id="getPayreceived" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeReceivedInfo">
        select
+            accountnumber,
+            accountname,
              CONCAT(year,'年',LPAD(month, 2, 0),'月费用') as "name" ,
              '--'as "ladderlevelname",
              payseriesno as "payseriesno",
@@ -245,7 +255,7 @@
         where
          account_id=#{accountId}
         and `year`=#{year}
-        group by `year`,`month`,payseriesno
+        group by accountnumber,accountname,`year`,`month`,payseriesno
     </select>
     <select id="getWaterusedamount" resultType="com.bz.smart_city.dto.pay.payfee.PayfeeWaterusedamount">
         select