From 6d25d879dc68d342a7c216962cfe29e737465730 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 19 Dec 2018 19:44:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83URL=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxPayAccount.java | 3 +++ .../service/impl/WxRefundOrderServiceImpl.java | 12 ++++++------ .../iformall/service/impl/WxSubsidyServiceImpl.java | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) 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 f61fef668..7629bffe3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -138,6 +138,9 @@ public class WxPayAccount implements Serializable { public String getSeparateNotifyUrl() { return notifyUrl + "/separate"; } + public String getSubsidyNotifyUrl() { + return notifyUrl + "/subsidyPay"; + } public static enum Field diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 2fde2266f..ed0f48973 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -454,7 +454,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderP.setRefund_desc("用户自己退款"); } - wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderP.setNotify_url(payAccount.getRefundNotifyUrl()); Map signMap = null; try { @@ -532,7 +532,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderSP.setRefund_desc("用户自己退款"); } - wxRefundOrderSP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderSP.setNotify_url(payAccount.getRefundNotifyUrl()); wxRefundOrderSP.setSign_type("HMAC-SHA256"); Map signMap = null; @@ -611,7 +611,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderP.setRefund_desc("用户自己退款"); } - wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderP.setNotify_url(payAccount.getRefundNotifyUrl()); Map returnMap = null; try { @@ -789,7 +789,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderP.setRefund_desc("用户自己退款"); } - wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderP.setNotify_url(payAccount.getRefundNotifyUrl()); Map signMap = null; try { @@ -867,7 +867,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderSP.setRefund_desc("用户自己退款"); } - wxRefundOrderSP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderSP.setNotify_url(payAccount.getRefundNotifyUrl()); wxRefundOrderSP.setSign_type("HMAC-SHA256"); Map signMap = null; @@ -946,7 +946,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } else { wxRefundOrderP.setRefund_desc("用户自己退款"); } - wxRefundOrderP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderP.setNotify_url(payAccount.getRefundNotifyUrl()); Map returnMap = null; try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index 3630755a5..7703ebec6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -139,7 +139,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { Date futureDate = new Date(); futureDate.setTime(curDate.getTime() + 15 * 60 * 1000); payOrder.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 - payOrder.setNotify_url(payAccount.getNotifyUrl() + "/subsidyPay"); + payOrder.setNotify_url(payAccount.getSubsidyNotifyUrl()); payOrder.setTrade_type("NATIVE"); payOrder.setProduct_id(record.getOrderNo()); payOrder.setSign_type("HMAC-SHA256");