shiyj1101 пре 4 година
родитељ
комит
b18acb00ed

+ 9 - 1
java110-bean/src/main/java/com/java110/dto/accountWithdrawalApply/AccountWithdrawalApplyDto.java

@@ -23,7 +23,7 @@ private String state;
 private String applyUserTel;
 private String applyUserId;
 private String stateName;
-
+private String bankId;
 
     private Date createTime;
 
@@ -103,4 +103,12 @@ public void setApplyUserId(String applyUserId) {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getBankId() {
+        return bankId;
+    }
+
+    public void setBankId(String bankId) {
+        this.bankId = bankId;
+    }
 }

+ 7 - 1
java110-bean/src/main/java/com/java110/po/accountWithdrawalApply/AccountWithdrawalApplyPo.java

@@ -16,6 +16,7 @@ private String statusCd = "0";
 private String state = "486";
 private String applyUserTel;
 private String applyUserId;
+private String bankId;
 public String getApplyId() {
         return applyId;
     }
@@ -71,6 +72,11 @@ public void setApplyUserId(String applyUserId) {
         this.applyUserId = applyUserId;
     }
 
+    public String getBankId() {
+        return bankId;
+    }
 
-
+    public void setBankId(String bankId) {
+        this.bankId = bankId;
+    }
 }

+ 25 - 8
java110-db/src/main/resources/mapper/acct/AccountWithdrawalApplyServiceDaoImplMapper.xml

@@ -11,9 +11,9 @@
     <!-- 保存账户提现信息 add by wuxw 2018-07-03 -->
     <insert id="saveAccountWithdrawalApplyInfo" parameterType="Map">
         insert into account_withdrawal_apply(
-apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_id
+apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_id,bank_id
 ) values (
-#{applyId},#{applyUserName},#{amount},#{context},#{acctId},#{state},#{applyUserTel},#{applyUserId}
+#{applyId},#{applyUserName},#{amount},#{context},#{acctId},#{state},#{applyUserTel},#{applyUserId},#{bankId}
 )
     </insert>
 
@@ -21,7 +21,10 @@ apply_id,apply_user_name,amount,context,acct_id,state,apply_user_tel,apply_user_
 
     <!-- 查询账户提现信息 add by wuxw 2018-07-03 -->
     <select id="getAccountWithdrawalApplyInfo" parameterType="Map" resultType="Map">
-    select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,t.amount,t.create_time,t.create_time createTime,t.context,t.acct_id,t.acct_id acctId,t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName
+    select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,
+    t.amount,t.create_time,t.create_time createTime,t.context,t.acct_id,t.acct_id acctId,
+    t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,
+    t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName,t.bank_id bankId
     from account_withdrawal_apply t left join t_dict t1 on t.state = t1.status_cd
     where t1.table_name='account_withdrawal_apply'
       and t1.table_columns='state'
@@ -85,8 +88,11 @@ order by t.create_time desc
 </if> 
 <if test="acctId !=null and acctId != ''">
 , t.acct_id= #{acctId}
-</if> 
-<if test="state !=null and state != ''">
+</if>
+    <if test="bankId !=null and bankId != ''">
+        , t.bank_id= #{bankId}
+    </if>
+        <if test="state !=null and state != ''">
 , t.state= #{state}
 </if> 
 <if test="applyUserTel !=null and applyUserTel != ''">
@@ -123,8 +129,11 @@ where 1 =1
 </if> 
 <if test="acctId !=null and acctId != ''">
    and t.acct_id= #{acctId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
+</if>
+         <if test="bankId !=null and bankId != ''">
+             and t.bank_id= #{bankId}
+         </if>
+         <if test="statusCd !=null and statusCd != ''">
    and t.status_cd= #{statusCd}
 </if> 
 <if test="state !=null and state != ''">
@@ -142,7 +151,9 @@ where 1 =1
 
     <!-- 查询账户提现信息 add by wuxw 2018-07-03 -->
     <select id="listStateWithdrawalApplys" parameterType="Map" resultType="Map">
-        select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,t.amount,t.create_time,t.create_time createTime,t.context,t.acct_id,t.acct_id acctId,t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName
+        select  t.apply_id,t.apply_id applyId,t.apply_user_name,t.apply_user_name applyUserName,t.amount,t.create_time,t.create_time createTime,
+        t.context,t.acct_id,t.acct_id acctId,t.status_cd,t.status_cd statusCd,t.state,t.apply_user_tel,t.apply_user_tel applyUserTel,
+        t.apply_user_id,t.apply_user_id applyUserId,t1.`name` stateName,t.bank_id bankId
         from account_withdrawal_apply t left join t_dict t1 on t.state = t1.status_cd
         where t1.table_name='account_withdrawal_apply'
         and t1.table_columns='state'
@@ -164,6 +175,9 @@ where 1 =1
         <if test="acctId !=null and acctId != ''">
             and t.acct_id= #{acctId}
         </if>
+        <if test="bankId !=null and bankId != ''">
+            and t.bank_id= #{bankId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -212,6 +226,9 @@ where 1 =1
         <if test="acctId !=null and acctId != ''">
             and t.acct_id= #{acctId}
         </if>
+        <if test="bankId !=null and bankId != ''">
+            and t.bank_id= #{bankId}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>

+ 1 - 0
service-acct/src/main/java/com/java110/acct/api/AccountWithdrawalApplyApi.java

@@ -40,6 +40,7 @@ public class AccountWithdrawalApplyApi {
 
         Assert.hasKeyAndValue(reqJson, "acctId", "请求报文中未包含acctId");
         Assert.hasKeyAndValue(reqJson, "amount", "请求报文中未包含amount");
+        Assert.hasKeyAndValue(reqJson, "bankId", "请求报文中未包含bankId");
 
         AccountWithdrawalApplyPo accountWithdrawalApplyPo = BeanConvertUtil.covertBean(reqJson, AccountWithdrawalApplyPo.class);
         return saveAccountWithdrawalApplyBMOImpl.save(accountWithdrawalApplyPo,userId,reqJson);