From a97d0261afaf3527ae7037d69ef8959dbcc0dc44 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 2 Sep 2018 21:25:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=80=80=E6=AC=BE][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/po/WxPayAccount.java | 12 ------------ .../service/impl/WxRefundOrderServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java index 1124cea4a..95f7ee127 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java @@ -54,9 +54,6 @@ public class WxPayAccount implements Serializable { /*证书本地存放位置**/ @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") private String certPath; - /*证书密码**/ - @io.swagger.annotations.ApiModelProperty(value="证书密码",name="certPass") - private String certPass; public String getMchId() { return mchId; } @@ -82,14 +79,6 @@ public class WxPayAccount implements Serializable { certPath = _certPath; } - public String getCertPass() { - return certPass; - } - - public void setCertPass(String certPass) { - this.certPass = certPass; - } - public String getPayNotifyUrl() { return notifyUrl + "/pay"; } @@ -107,7 +96,6 @@ public class WxPayAccount implements Serializable { ,ApiKey_ASC("`api_key` ASC"),ApiKey_DESC("`api_key` DESC") ,NotifyUrl_ASC("`notify_url` ASC"),NotifyUrl_DESC("`notify_url` DESC") ,CertPath_ASC("`cert_path` ASC"),CertPath_DESC("`cert_path` DESC") - ,CertPass_ASC("`cert_pass` ASC"),CertPass_DESC("`cert_pass` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java index ad4adf796..cd32d4292 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -280,7 +280,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { signMap.put("sign", signAgent); String response = null; try { - response = WxPay.orderRefund(signMap, payAccount.getCertPath(), payAccount.getCertPass()); + response = WxPay.orderRefund(signMap, payAccount.getCertPath(), payAccount.getMchId()); } catch (Exception e) { logger.error("退款异常: " + e.getMessage()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), "退款异常");