Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/returnPayFee/ReturnPayFeeDto.java

@@ -60,6 +60,16 @@ public class ReturnPayFeeDto extends PageDto implements Serializable {
     private String payerObjType;
     private String payerObjName;
 
+    //alter table return_pay_fee add COLUMN apply_person_id varchar(30) comment '申请人ID';
+    //alter table return_pay_fee add COLUMN apply_person_name varchar(30) comment '申请人';
+    //
+    //alter table return_pay_fee add COLUMN audit_person_id varchar(30) comment '审核人ID';
+    //alter table return_pay_fee add COLUMN audit_person_name varchar(30) comment '审核人';
+    private String applyPersonId;
+    private String applyPersonName;
+    private String auditPersonId;
+    private String auditPersonName;
+
     private List<FeeAccountDetailDto> feeAccountDetailDtoList;
     private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
 
@@ -350,4 +360,36 @@ public class ReturnPayFeeDto extends PageDto implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getApplyPersonId() {
+        return applyPersonId;
+    }
+
+    public void setApplyPersonId(String applyPersonId) {
+        this.applyPersonId = applyPersonId;
+    }
+
+    public String getApplyPersonName() {
+        return applyPersonName;
+    }
+
+    public void setApplyPersonName(String applyPersonName) {
+        this.applyPersonName = applyPersonName;
+    }
+
+    public String getAuditPersonId() {
+        return auditPersonId;
+    }
+
+    public void setAuditPersonId(String auditPersonId) {
+        this.auditPersonId = auditPersonId;
+    }
+
+    public String getAuditPersonName() {
+        return auditPersonName;
+    }
+
+    public void setAuditPersonName(String auditPersonName) {
+        this.auditPersonName = auditPersonName;
+    }
 }

java110-bean/src/main/java/com/java110/po/fee/ReturnPayFeePo.java

@@ -29,6 +29,11 @@ public class ReturnPayFeePo implements Serializable {
     private String payTime;
     private String reason;
 
+    private String applyPersonId;
+    private String applyPersonName;
+    private String auditPersonId;
+    private String auditPersonName;
+
     public String getReturnFeeId() {
         return returnFeeId;
     }
@@ -140,4 +145,36 @@ public class ReturnPayFeePo implements Serializable {
     public void setReason(String reason) {
         this.reason = reason;
     }
+
+    public String getApplyPersonId() {
+        return applyPersonId;
+    }
+
+    public void setApplyPersonId(String applyPersonId) {
+        this.applyPersonId = applyPersonId;
+    }
+
+    public String getApplyPersonName() {
+        return applyPersonName;
+    }
+
+    public void setApplyPersonName(String applyPersonName) {
+        this.applyPersonName = applyPersonName;
+    }
+
+    public String getAuditPersonId() {
+        return auditPersonId;
+    }
+
+    public void setAuditPersonId(String auditPersonId) {
+        this.auditPersonId = auditPersonId;
+    }
+
+    public String getAuditPersonName() {
+        return auditPersonName;
+    }
+
+    public void setAuditPersonName(String auditPersonName) {
+        this.auditPersonName = auditPersonName;
+    }
 }

java110-bean/src/main/java/com/java110/po/returnPayFee/ReturnPayFeePo.java

@@ -17,6 +17,7 @@ package com.java110.po.returnPayFee;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-02-21 12:20:03 mail: 928255095@qq.com
@@ -28,111 +29,175 @@ import java.util.Date;
 public class ReturnPayFeePo implements Serializable {
 
     private String reason;
-private String primeRate;
-private String feeTypeCd;
-private String payTime;
-private String detailId;
-private String receivableAmount;
-private String cycles;
-private String remark;
-private String statusCd = "0";
-private String receivedAmount;
-private String feeId;
-private String returnFeeId;
-private String configId;
-private String state;
-private String communityId;
-public String getReason() {
+    private String primeRate;
+    private String feeTypeCd;
+    private String payTime;
+    private String detailId;
+    private String receivableAmount;
+    private String cycles;
+    private String remark;
+    private String statusCd = "0";
+    private String receivedAmount;
+    private String feeId;
+    private String returnFeeId;
+    private String configId;
+    private String state;
+    private String communityId;
+
+    private String applyPersonId;
+    private String applyPersonName;
+    private String auditPersonId;
+    private String auditPersonName;
+
+    public String getReason() {
         return reason;
     }
-public void setReason(String reason) {
+
+    public void setReason(String reason) {
         this.reason = reason;
     }
-public String getPrimeRate() {
+
+    public String getPrimeRate() {
         return primeRate;
     }
-public void setPrimeRate(String primeRate) {
+
+    public void setPrimeRate(String primeRate) {
         this.primeRate = primeRate;
     }
-public String getFeeTypeCd() {
+
+    public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
-public String getPayTime() {
+
+    public String getPayTime() {
         return payTime;
     }
-public void setPayTime(String payTime) {
+
+    public void setPayTime(String payTime) {
         this.payTime = payTime;
     }
-public String getDetailId() {
+
+    public String getDetailId() {
         return detailId;
     }
-public void setDetailId(String detailId) {
+
+    public void setDetailId(String detailId) {
         this.detailId = detailId;
     }
-public String getReceivableAmount() {
+
+    public String getReceivableAmount() {
         return receivableAmount;
     }
-public void setReceivableAmount(String receivableAmount) {
+
+    public void setReceivableAmount(String receivableAmount) {
         this.receivableAmount = receivableAmount;
     }
-public String getCycles() {
+
+    public String getCycles() {
         return cycles;
     }
-public void setCycles(String cycles) {
+
+    public void setCycles(String cycles) {
         this.cycles = cycles;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getReceivedAmount() {
+
+    public String getReceivedAmount() {
         return receivedAmount;
     }
-public void setReceivedAmount(String receivedAmount) {
+
+    public void setReceivedAmount(String receivedAmount) {
         this.receivedAmount = receivedAmount;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getReturnFeeId() {
+
+    public String getReturnFeeId() {
         return returnFeeId;
     }
-public void setReturnFeeId(String returnFeeId) {
+
+    public void setReturnFeeId(String returnFeeId) {
         this.returnFeeId = returnFeeId;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getApplyPersonId() {
+        return applyPersonId;
+    }
+
+    public void setApplyPersonId(String applyPersonId) {
+        this.applyPersonId = applyPersonId;
+    }
+
+    public String getApplyPersonName() {
+        return applyPersonName;
+    }
 
+    public void setApplyPersonName(String applyPersonName) {
+        this.applyPersonName = applyPersonName;
+    }
+
+    public String getAuditPersonId() {
+        return auditPersonId;
+    }
 
+    public void setAuditPersonId(String auditPersonId) {
+        this.auditPersonId = auditPersonId;
+    }
+
+    public String getAuditPersonName() {
+        return auditPersonName;
+    }
+
+    public void setAuditPersonName(String auditPersonName) {
+        this.auditPersonName = auditPersonName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/returnPayFee/ApiReturnPayFeeDataVo.java

@@ -48,6 +48,14 @@ public class ApiReturnPayFeeDataVo implements Serializable {
     private String payerObjType;
     private String payerObjName;
 
+    private String applyPersonId;
+    private String applyPersonName;
+    private String auditPersonId;
+    private String auditPersonName;
+
+
+
+
     private List<FeeAccountDetailDto> feeAccountDetailDtoList;
     private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
 
@@ -362,4 +370,36 @@ public class ApiReturnPayFeeDataVo implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getApplyPersonId() {
+        return applyPersonId;
+    }
+
+    public void setApplyPersonId(String applyPersonId) {
+        this.applyPersonId = applyPersonId;
+    }
+
+    public String getApplyPersonName() {
+        return applyPersonName;
+    }
+
+    public void setApplyPersonName(String applyPersonName) {
+        this.applyPersonName = applyPersonName;
+    }
+
+    public String getAuditPersonId() {
+        return auditPersonId;
+    }
+
+    public void setAuditPersonId(String auditPersonId) {
+        this.auditPersonId = auditPersonId;
+    }
+
+    public String getAuditPersonName() {
+        return auditPersonName;
+    }
+
+    public void setAuditPersonName(String auditPersonName) {
+        this.auditPersonName = auditPersonName;
+    }
 }

java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml

@@ -161,6 +161,8 @@
         t.b_id,t.b_id bId,
         t.community_id,t.community_id communityId,
         t.create_time,t.create_time createTime,
+        t.apply_person_id applyPersonId,t.apply_person_name applyPersonName,
+        t.audit_person_id auditPersonId,t.audit_person_name auditPersonName,
         d.name feeTypeCdName,
         c.name stateName,
         pf.payer_obj_type payerObjType,
@@ -229,6 +231,18 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="applyPersonId !=null and applyPersonId != ''">
+            and t.apply_person_id= #{applyPersonId}
+        </if>
+        <if test="applyPersonName !=null and applyPersonName != ''">
+            and t.apply_person_name like concat('%',#{applyPersonName},'%')
+        </if>
+        <if test="auditPersonId !=null and auditPersonId != ''">
+            and t.audit_person_id= #{auditPersonId}
+        </if>
+        <if test="auditPersonName !=null and auditPersonName != ''">
+            and t.audit_person_name like concat('%',#{auditPersonName},'%')
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

java110-db/src/main/resources/mapper/fee/ReturnPayFeeV1ServiceDaoImplMapper.xml

@@ -5,183 +5,215 @@
 <mapper namespace="returnPayFeeV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存退费表信息 add by wuxw 2018-07-03 -->
     <insert id="saveReturnPayFeeInfo" parameterType="Map">
         insert into return_pay_fee(
-reason,prime_rate,fee_type_cd,pay_time,detail_id,receivable_amount,cycles,remark,received_amount,fee_id,return_fee_id,config_id,state,community_id
-) values (
-#{reason},#{primeRate},#{feeTypeCd},#{payTime},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},#{feeId},#{returnFeeId},#{configId},#{state},#{communityId}
-)
+        reason,prime_rate,fee_type_cd,pay_time,detail_id,receivable_amount,cycles,remark,received_amount,
+        fee_id,return_fee_id,config_id,state,community_id,apply_person_id,apply_person_name
+        ) values (
+        #{reason},#{primeRate},#{feeTypeCd},#{payTime},#{detailId},#{receivableAmount},#{cycles},#{remark},#{receivedAmount},
+        #{feeId},#{returnFeeId},#{configId},#{state},#{communityId},#{applyPersonId},#{applyPersonName}
+        )
     </insert>
 
 
-
     <!-- 查询退费表信息 add by wuxw 2018-07-03 -->
     <select id="getReturnPayFeeInfo" parameterType="Map" resultType="Map">
-        select  t.reason,t.prime_rate,t.prime_rate primeRate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.pay_time,t.pay_time payTime,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.fee_id,t.fee_id feeId,t.return_fee_id,t.return_fee_id returnFeeId,t.config_id,t.config_id configId,t.state,t.community_id,t.community_id communityId 
-from return_pay_fee t 
-where 1 =1 
-<if test="reason !=null and reason != ''">
-   and t.reason= #{reason}
-</if> 
-<if test="primeRate !=null and primeRate != ''">
-   and t.prime_rate= #{primeRate}
-</if> 
-<if test="feeTypeCd !=null and feeTypeCd != ''">
-   and t.fee_type_cd= #{feeTypeCd}
-</if> 
-<if test="payTime !=null and payTime != ''">
-   and t.pay_time= #{payTime}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="receivableAmount !=null and receivableAmount != ''">
-   and t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="cycles !=null and cycles != ''">
-   and t.cycles= #{cycles}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-   and t.received_amount= #{receivedAmount}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="returnFeeId !=null and returnFeeId != ''">
-   and t.return_fee_id= #{returnFeeId}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.reason,t.prime_rate,t.prime_rate primeRate,t.fee_type_cd,t.fee_type_cd feeTypeCd,t.pay_time,t.pay_time
+        payTime,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount
+        receivableAmount,t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
+        receivedAmount,t.fee_id,t.fee_id feeId,t.return_fee_id,t.return_fee_id returnFeeId,t.config_id,t.config_id
+        configId,t.state,t.community_id,t.community_id communityId,t.apply_person_id applyPersonId,t.apply_person_name applyPersonName,
+        t.audit_person_id auditPersonId,t.audit_person_name auditPersonName
+        from return_pay_fee t
+        where 1 =1
+        <if test="reason !=null and reason != ''">
+            and t.reason= #{reason}
+        </if>
+        <if test="primeRate !=null and primeRate != ''">
+            and t.prime_rate= #{primeRate}
+        </if>
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and t.fee_type_cd= #{feeTypeCd}
+        </if>
+        <if test="payTime !=null and payTime != ''">
+            and t.pay_time= #{payTime}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            and t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="cycles !=null and cycles != ''">
+            and t.cycles= #{cycles}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            and t.received_amount= #{receivedAmount}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="returnFeeId !=null and returnFeeId != ''">
+            and t.return_fee_id= #{returnFeeId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="applyPersonId !=null and applyPersonId != ''">
+            and t.apply_person_id= #{applyPersonId}
+        </if>
+        <if test="applyPersonName !=null and applyPersonName != ''">
+            and t.apply_person_name like concat('%',#{applyPersonName},'%')
+        </if>
+        <if test="auditPersonId !=null and auditPersonId != ''">
+            and t.audit_person_id= #{auditPersonId}
+        </if>
+        <if test="auditPersonName !=null and auditPersonName != ''">
+            and t.audit_person_name like concat('%',#{auditPersonName},'%')
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改退费表信息 add by wuxw 2018-07-03 -->
     <update id="updateReturnPayFeeInfo" parameterType="Map">
-        update  return_pay_fee t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="reason !=null and reason != ''">
-, t.reason= #{reason}
-</if> 
-<if test="primeRate !=null and primeRate != ''">
-, t.prime_rate= #{primeRate}
-</if> 
-<if test="feeTypeCd !=null and feeTypeCd != ''">
-, t.fee_type_cd= #{feeTypeCd}
-</if> 
-<if test="payTime !=null and payTime != ''">
-, t.pay_time= #{payTime}
-</if> 
-<if test="detailId !=null and detailId != ''">
-, t.detail_id= #{detailId}
-</if> 
-<if test="receivableAmount !=null and receivableAmount != ''">
-, t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="cycles !=null and cycles != ''">
-, t.cycles= #{cycles}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-, t.received_amount= #{receivedAmount}
-</if> 
-<if test="feeId !=null and feeId != ''">
-, t.fee_id= #{feeId}
-</if> 
-<if test="configId !=null and configId != ''">
-, t.config_id= #{configId}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="returnFeeId !=null and returnFeeId != ''">
-and t.return_fee_id= #{returnFeeId}
-</if> 
+        update return_pay_fee t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="reason !=null and reason != ''">
+            , t.reason= #{reason}
+        </if>
+        <if test="primeRate !=null and primeRate != ''">
+            , t.prime_rate= #{primeRate}
+        </if>
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            , t.fee_type_cd= #{feeTypeCd}
+        </if>
+        <if test="payTime !=null and payTime != ''">
+            , t.pay_time= #{payTime}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            , t.detail_id= #{detailId}
+        </if>
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            , t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="cycles !=null and cycles != ''">
+            , t.cycles= #{cycles}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            , t.received_amount= #{receivedAmount}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            , t.config_id= #{configId}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="auditPersonId !=null and auditPersonId != ''">
+            , t.audit_person_id= #{auditPersonId}
+        </if>
+        <if test="auditPersonName !=null and auditPersonName != ''">
+            , t.audit_person_name= #{auditPersonName}
+        </if>
+        where 1=1
+        <if test="returnFeeId !=null and returnFeeId != ''">
+            and t.return_fee_id= #{returnFeeId}
+        </if>
 
     </update>
 
     <!-- 查询退费表数量 add by wuxw 2018-07-03 -->
-     <select id="queryReturnPayFeesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from return_pay_fee t 
-where 1 =1 
-<if test="reason !=null and reason != ''">
-   and t.reason= #{reason}
-</if> 
-<if test="primeRate !=null and primeRate != ''">
-   and t.prime_rate= #{primeRate}
-</if> 
-<if test="feeTypeCd !=null and feeTypeCd != ''">
-   and t.fee_type_cd= #{feeTypeCd}
-</if> 
-<if test="payTime !=null and payTime != ''">
-   and t.pay_time= #{payTime}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="receivableAmount !=null and receivableAmount != ''">
-   and t.receivable_amount= #{receivableAmount}
-</if> 
-<if test="cycles !=null and cycles != ''">
-   and t.cycles= #{cycles}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="receivedAmount !=null and receivedAmount != ''">
-   and t.received_amount= #{receivedAmount}
-</if> 
-<if test="feeId !=null and feeId != ''">
-   and t.fee_id= #{feeId}
-</if> 
-<if test="returnFeeId !=null and returnFeeId != ''">
-   and t.return_fee_id= #{returnFeeId}
-</if> 
-<if test="configId !=null and configId != ''">
-   and t.config_id= #{configId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryReturnPayFeesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from return_pay_fee t
+        where 1 =1
+        <if test="reason !=null and reason != ''">
+            and t.reason= #{reason}
+        </if>
+        <if test="primeRate !=null and primeRate != ''">
+            and t.prime_rate= #{primeRate}
+        </if>
+        <if test="feeTypeCd !=null and feeTypeCd != ''">
+            and t.fee_type_cd= #{feeTypeCd}
+        </if>
+        <if test="payTime !=null and payTime != ''">
+            and t.pay_time= #{payTime}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="receivableAmount !=null and receivableAmount != ''">
+            and t.receivable_amount= #{receivableAmount}
+        </if>
+        <if test="cycles !=null and cycles != ''">
+            and t.cycles= #{cycles}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="receivedAmount !=null and receivedAmount != ''">
+            and t.received_amount= #{receivedAmount}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="returnFeeId !=null and returnFeeId != ''">
+            and t.return_fee_id= #{returnFeeId}
+        </if>
+        <if test="configId !=null and configId != ''">
+            and t.config_id= #{configId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="applyPersonId !=null and applyPersonId != ''">
+            and t.apply_person_id= #{applyPersonId}
+        </if>
+        <if test="applyPersonName !=null and applyPersonName != ''">
+            and t.apply_person_name like concat('%',#{applyPersonName},'%')
+        </if>
+        <if test="auditPersonId !=null and auditPersonId != ''">
+            and t.audit_person_id= #{auditPersonId}
+        </if>
+        <if test="auditPersonName !=null and auditPersonName != ''">
+            and t.audit_person_name= #{auditPersonName}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -283,6 +283,7 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
         }
         RoomDto tmpRoomDto = new RoomDto();
         tmpRoomDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+        tmpRoomDto.setRoomNum(roomDto.getRoomNum());
         tmpRoomDto.setCommunityId(roomDto.getCommunityId());
         return queryRooms(tmpRoomDto);
 

service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListReturnPayFeesCmd.java

@@ -26,6 +26,7 @@ import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
 import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.returnPayFee.ApiReturnPayFeeDataVo;
 import com.java110.vo.api.returnPayFee.ApiReturnPayFeeVo;
@@ -67,6 +68,7 @@ public class ListReturnPayFeesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区信息");
     }
 
     @Override
@@ -98,30 +100,6 @@ public class ListReturnPayFeesCmd extends Cmd {
                 }
                 returnPayFeeDtos.add(returnPayFee);
             }
-            //List<ReturnPayFeeDto> returnPayFeeDtoList = new ArrayList<>();
-//            for (ReturnPayFeeDto returnPayFee : returnPayFeeDtos) {
-//                //获取付款方标识
-//                String payerObjType = returnPayFee.getPayerObjType();
-//                if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("3333")) { //房屋
-//                    returnPayFeeDto.setReturnFeeId(returnPayFee.getReturnFeeId());
-//                    List<ReturnPayFeeDto> returnPayFeeList = returnPayFeeInnerServiceSMOImpl.queryRoomReturnPayFees(returnPayFeeDto);
-//                    if (returnPayFeeList == null || returnPayFeeList.size() < 1) {
-//                        continue;
-//                    }
-//                    //returnPayFeeDtoList.add(returnPayFeeList.get(0));
-//                    BeanConvertUtil.covertBean(returnPayFeeList.get(0), returnPayFee);
-//                } else if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("6666")) { //车辆
-//                    returnPayFeeDto.setReturnFeeId(returnPayFee.getReturnFeeId());
-//                    List<ReturnPayFeeDto> returnPayFeeList = returnPayFeeInnerServiceSMOImpl.queryCarReturnPayFees(returnPayFeeDto);
-//                    if (returnPayFeeList == null || returnPayFeeList.size() < 1) {
-//                        continue;
-//                    }
-//                    BeanConvertUtil.covertBean(returnPayFeeList.get(0), returnPayFee);
-//                    //returnPayFeeDtoList.add(returnPayFeeList.get(0));
-//                } else {
-//                    continue;
-//                }
-//            }
             returnPayFees = BeanConvertUtil.covertBeanList(returnPayFeeDtos, ApiReturnPayFeeDataVo.class);
         } else {
             returnPayFees = new ArrayList<>();

service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/SaveReturnPayFeeCmd.java

@@ -25,10 +25,12 @@ import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.returnPayFee.ReturnPayFeeDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
 import com.java110.intf.fee.IReturnPayFeeV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.po.returnPayFee.ReturnPayFeePo;
 import com.java110.utils.exception.CmdException;
@@ -71,6 +73,9 @@ public class SaveReturnPayFeeCmd extends Cmd {
     @Autowired
     private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
@@ -92,6 +97,14 @@ public class SaveReturnPayFeeCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户不存在");
+
         FeeDto feeDto = new FeeDto();
         feeDto.setCommunityId(reqJson.getString("communityId"));
         feeDto.setFeeId(reqJson.getString("feeId"));
@@ -106,10 +119,12 @@ public class SaveReturnPayFeeCmd extends Cmd {
         ReturnPayFeePo returnPayFeePo = BeanConvertUtil.covertBean(reqJson, ReturnPayFeePo.class);
         returnPayFeePo.setReturnFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         returnPayFeePo.setState(ReturnPayFeeDto.STATE_WAIT);
-        returnPayFeePo.setCycles((reqJson.getDouble("cycles") * -1)+"");
-        returnPayFeePo.setReceivableAmount((reqJson.getDouble("receivableAmount") * -1)+"");
-        returnPayFeePo.setReceivedAmount((reqJson.getDouble("receivedAmount") * -1)+"");
+        returnPayFeePo.setCycles((reqJson.getDouble("cycles") * -1) + "");
+        returnPayFeePo.setReceivableAmount((reqJson.getDouble("receivableAmount") * -1) + "");
+        returnPayFeePo.setReceivedAmount((reqJson.getDouble("receivedAmount") * -1) + "");
         returnPayFeePo.setPrimeRate("7"); //退费默认方式为转账
+        returnPayFeePo.setApplyPersonId(userId);
+        returnPayFeePo.setApplyPersonName(userDtos.get(0).getName());
         int flag = returnPayFeeV1InnerServiceSMOImpl.saveReturnPayFee(returnPayFeePo);
 
         if (flag < 1) {

service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/UpdateReturnPayFeeCmd.java

@@ -37,6 +37,7 @@ import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
 import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
 import com.java110.dto.returnPayFee.ReturnPayFeeDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
 import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO;
@@ -45,6 +46,7 @@ import com.java110.intf.fee.*;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.account.AccountPo;
 import com.java110.po.accountDetail.AccountDetailPo;
 import com.java110.po.fee.PayFeeDetailPo;
@@ -147,6 +149,9 @@ public class UpdateReturnPayFeeCmd extends Cmd {
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     private static final String SPEC_RATE = "89002020980015"; //赠送月份
 
     private static final String SPEC_MONTH = "89002020980014"; //月份
@@ -176,8 +181,15 @@ public class UpdateReturnPayFeeCmd extends Cmd {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户不存在");
         FeeDetailDto feeDetailDto = (FeeDetailDto) reqJson.get("feeDetailDto");
-        updateReturnPayFee(reqJson);
+        updateReturnPayFee(reqJson,userDtos.get(0));
         //退费审核通过
         if ("1100".equals(reqJson.getString("state"))) {
             //判断退费周期是否为负数如果不是 抛出异常
@@ -383,7 +395,7 @@ public class UpdateReturnPayFeeCmd extends Cmd {
      * @param paramInJson 接口调用放传入入参
      * @return 订单服务能够接受的报文
      */
-    public void updateReturnPayFee(JSONObject paramInJson) {
+    public void updateReturnPayFee(JSONObject paramInJson,UserDto userDto) {
         ReturnPayFeeDto returnPayFeeDto = new ReturnPayFeeDto();
         returnPayFeeDto.setReturnFeeId(paramInJson.getString("returnFeeId"));
         List<ReturnPayFeeDto> returnPayFeeDtos = returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto);
@@ -392,6 +404,8 @@ public class UpdateReturnPayFeeCmd extends Cmd {
         businessReturnPayFee.putAll(BeanConvertUtil.beanCovertMap(returnPayFeeDtos.get(0)));
         businessReturnPayFee.putAll(paramInJson);
         ReturnPayFeePo returnPayFeePo = BeanConvertUtil.covertBean(businessReturnPayFee, ReturnPayFeePo.class);
+        returnPayFeePo.setAuditPersonId(userDto.getUserId());
+        returnPayFeePo.setAuditPersonName(userDto.getName());
         int flag = returnPayFeeV1InnerServiceSMOImpl.updateReturnPayFee(returnPayFeePo);
         if (flag < 1) {
             throw new CmdException("更新数据失败");