Просмотр исходного кода

[支付账号信息][新增]:新增甲方银行账号信息

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
8efbfcced3
4 измененных файлов: 102 добавлений и 17 удалений
  1. +0
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
  2. +23
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java
  3. +74
    -0
      mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml
  4. +5
    -5
      mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml

+ 0
- 11
mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java Просмотреть файл

@@ -48,9 +48,6 @@ public class WxPayAccount implements Serializable {
/**微信服务商号*/
@io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId")
private String subMchId;

@io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="parentMchId")
private String parentMchId;
/**支付密钥**/
@io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey")
private String apiKey;
@@ -93,14 +90,6 @@ public class WxPayAccount implements Serializable {
this.subMchId = subMchId;
}

public String getParentMchId() {
return parentMchId;
}

public void setParentMchId(String parentMchId) {
this.parentMchId = parentMchId;
}

public String getApiKey() {
return apiKey;
}


+ 23
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java Просмотреть файл

@@ -70,6 +70,12 @@ public class WxPayAccountBill implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="手续费",name="rate")
private Integer rate;

@io.swagger.annotations.ApiModelProperty(value="接收账户名",name="bankAccountName")
private String bankAccountName;
/**证书本地存放位置**/
@io.swagger.annotations.ApiModelProperty(value="接收银行卡号",name="bankCardId")
private String bankCardId;

public String getTenantId() {
return tenantId;
}
@@ -132,7 +138,23 @@ public class WxPayAccountBill implements Serializable {
this.rate = rate;
}

public String getPayNotifyUrl() {
public String getBankAccountName() {
return bankAccountName;
}

public void setBankAccountName(String bankAccountName) {
this.bankAccountName = bankAccountName;
}

public String getBankCardId() {
return bankCardId;
}

public void setBankCardId(String bankCardId) {
this.bankCardId = bankCardId;
}

public String getPayNotifyUrl() {
return notifyUrl + "/pay";
}
public String getRefundNotifyUrl() {


+ 74
- 0
mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml Просмотреть файл

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxPayAccountBillMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxPayAccountBill">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="mch_id" jdbcType="VARCHAR" property="mchId"/>
<result column="sub_mch_id" jdbcType="VARCHAR" property="subMchId"/>
<result column="api_key" jdbcType="VARCHAR" property="apiKey"/>
<result column="notify_url" jdbcType="VARCHAR" property="notifyUrl"/>
<result column="cert_path" jdbcType="VARCHAR" property="certPath"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="share" jdbcType="INTEGER" property="share"/>
<result column="rate" jdbcType="INTEGER" property="rate"/>
<result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName"/>
<result column="bank_card_id" jdbcType="VARCHAR" property="bankCardId"/>
</resultMap>

<sql id="allColumns">
`id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}
</if>

<if test=" null != mchId ">
and `mch_id` = #{mchId}
</if>

<if test=" null != subMchId ">
and `sub_mch_id` = #{subMchId}
</if>

<if test=" null != apiKey ">
and `api_key` like concat('%', #{apiKey},'%')
</if>

<if test=" null != notifyUrl ">
and `notify_url` like concat('%', #{notifyUrl},'%')
</if>

<if test=" null != certPath ">
and `cert_path` like concat('%', #{certPath},'%')
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != share ">
and `share` = #{share}
</if>
<if test=" null != rate ">
and `rate` = #{rate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxPayAccount" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_pay_account
<include refid="dynamicWhereConditions"/>
</select>


</mapper>

+ 5
- 5
mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml Просмотреть файл

@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxPayAccount">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="mch_id" jdbcType="VARCHAR" property="mchId"/>
<result column="parent_mch_id" jdbcType="VARCHAR" property="parentMchId"/>
<result column="sub_mch_id" jdbcType="VARCHAR" property="subMchId"/>
<result column="api_key" jdbcType="VARCHAR" property="apiKey"/>
<result column="notify_url" jdbcType="VARCHAR" property="notifyUrl"/>
<result column="cert_path" jdbcType="VARCHAR" property="certPath"/>
@@ -14,7 +14,7 @@
</resultMap>

<sql id="allColumns">
`id`,`mch_id`,`parent_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`
`id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`
</sql>

<sql id="dynamicWhereConditions">
@@ -25,11 +25,11 @@
</if>

<if test=" null != mchId ">
and `mch_id` like concat('%', #{mchId},'%')
and `mch_id` = #{mchId}
</if>

<if test=" null != parentMchId ">
and `parent_mch_id` like concat('%', #{parentMchId},'%')
<if test=" null != subMchId ">
and `sub_mch_id` = #{subMchId}
</if>

<if test=" null != apiKey ">


Загрузка…
Отмена
Сохранить