From 8efbfcced39f00fa72d6f9b2e62fd820d51af0a5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 1 Apr 2019 11:30:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E8=B4=A6=E5=8F=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF][=E6=96=B0=E5=A2=9E]:=E6=96=B0=E5=A2=9E=E7=94=B2?= =?UTF-8?q?=E6=96=B9=E9=93=B6=E8=A1=8C=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxPayAccount.java | 11 --- .../iformall/domain/po/WxPayAccountBill.java | 24 +++++- .../mapper/WxPayAccountBillMapper.xml | 74 +++++++++++++++++++ .../resources/mapper/WxPayAccountMapper.xml | 10 +-- 4 files changed, 102 insertions(+), 17 deletions(-) create mode 100644 mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 47b0df4c1..081096a89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/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; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java index ad1998a5a..17fdb7fc6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java +++ b/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() { diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml new file mode 100644 index 000000000..5f051ee07 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + `id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `mch_id` = #{mchId} + + + + and `sub_mch_id` = #{subMchId} + + + + and `api_key` like concat('%', #{apiKey},'%') + + + + and `notify_url` like concat('%', #{notifyUrl},'%') + + + + and `cert_path` like concat('%', #{certPath},'%') + + + and `type` = #{type} + + + and `share` = #{share} + + + and `rate` = #{rate} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml index 301d78a17..1bd9d5c16 100644 --- a/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - `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` @@ -25,11 +25,11 @@ - and `mch_id` like concat('%', #{mchId},'%') + and `mch_id` = #{mchId} - - and `parent_mch_id` like concat('%', #{parentMchId},'%') + + and `sub_mch_id` = #{subMchId}