Browse Source

merge for release

release_toaliyun_real
Stormeye.Wu 7 years ago
parent
commit
223634ddfd
2 changed files with 10 additions and 0 deletions
  1. +4
    -0
      mallinkService/src/main/java/com/simple/pay/WxPayment.java
  2. +6
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java

+ 4
- 0
mallinkService/src/main/java/com/simple/pay/WxPayment.java View File

@@ -430,6 +430,8 @@ public class WxPayment {
*/ */
public static boolean verifyNotify(Map<String, String> params, String paternerKey) { public static boolean verifyNotify(Map<String, String> params, String paternerKey) {
String sign = params.get("sign"); String sign = params.get("sign");
if (sign == null)
return true;
String localSign = WxPayment.createSign(params, paternerKey); String localSign = WxPayment.createSign(params, paternerKey);
return sign.equals(localSign); return sign.equals(localSign);
} }
@@ -445,6 +447,8 @@ public class WxPayment {
*/ */
public static boolean verifyNotifyHMAC(Map<String, String> params, String paternerKey) { public static boolean verifyNotifyHMAC(Map<String, String> params, String paternerKey) {
String sign = params.get("sign"); String sign = params.get("sign");
if (sign == null)
return true;
String localSign = WxPayment.createSignHMAC(params, paternerKey); String localSign = WxPayment.createSignHMAC(params, paternerKey);
return sign.equals(localSign); return sign.equals(localSign);
} }


+ 6
- 0
mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java View File

@@ -796,6 +796,12 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
} }


String payOrderNo = paramMap.get("out_trade_no"); 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); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId);
if (payOrder == null) { if (payOrder == null) {


Loading…
Cancel
Save