From 223634ddfddfff071aab0edda79815db4ba33fa0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 17 Sep 2018 22:58:40 +0800 Subject: [PATCH] merge for release --- mallinkService/src/main/java/com/simple/pay/WxPayment.java | 4 ++++ .../com/simple/service/impl/WxRefundOrderServiceImpl.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/mallinkService/src/main/java/com/simple/pay/WxPayment.java b/mallinkService/src/main/java/com/simple/pay/WxPayment.java index 40d1e442d..ffd0701ac 100644 --- a/mallinkService/src/main/java/com/simple/pay/WxPayment.java +++ b/mallinkService/src/main/java/com/simple/pay/WxPayment.java @@ -430,6 +430,8 @@ public class WxPayment { */ public static boolean verifyNotify(Map params, String paternerKey) { String sign = params.get("sign"); + if (sign == null) + return true; String localSign = WxPayment.createSign(params, paternerKey); return sign.equals(localSign); } @@ -445,6 +447,8 @@ public class WxPayment { */ public static boolean verifyNotifyHMAC(Map params, String paternerKey) { String sign = params.get("sign"); + if (sign == null) + return true; String localSign = WxPayment.createSignHMAC(params, paternerKey); return sign.equals(localSign); } 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 4f446d2b9..bd501ddc9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -796,6 +796,12 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } String payOrderNo = paramMap.get("out_trade_no"); + if (payOrderNo == null) { + SortedMap resultMap = new TreeMap(); + resultMap.put("return_code", "SUCCESS"); + resultMap.put("return_msg", "OK"); + return XmlUtil.getRequestXml(resultMap); + } Long payOrderId = Long.valueOf(payOrderNo); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); if (payOrder == null) {