From 2bcd6eeba83c43c65ad9cd675fda774bba11245f Mon Sep 17 00:00:00 2001 From: egzosn Date: Wed, 28 Nov 2018 14:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=9A=E5=BF=85=E9=A1=BB=E6=BB=A1=E8=B6=B3?= =?UTF-8?q?=E2=80=9C=E4=BB=A5=E4=B8=8B=E5=AD=97=E6=AE=B5=E5=9C=A8return=5F?= =?UTF-8?q?code=20=E5=92=8Cresult=5Fcode=E9=83=BD=E4=B8=BASUCCESS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/egzosn/pay/wx/api/WxPayService.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 4abd539..67ccc37 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -56,6 +56,7 @@ public class WxPayService extends BasePayService { private static final String HMAC_SHA256 = "HMAC-SHA256"; private static final String HMACSHA256 = "HMACSHA256"; private static final String RETURN_MSG_CODE = "return_msg"; + private static final String RESULT_CODE = "result_code"; @@ -110,7 +111,7 @@ public class WxPayService extends BasePayService { @Override public boolean verify(Map params) { - if (!SUCCESS.equals(params.get(RETURN_CODE))){ + if (!(SUCCESS.equals(params.get(RETURN_CODE)) && SUCCESS.equals(params.get(RESULT_CODE)))){ LOG.debug(String.format("微信支付异常：return_code=%s,参数集=%s", params.get(RETURN_CODE), params)); return false; } @@ -185,14 +186,17 @@ public class WxPayService extends BasePayService { */ public JSONObject unifiedOrder(PayOrder order) { - ////统一下单 + //统一下单 Map parameters = getPublicParameters(); - - parameters.put("body", order.getSubject());// 购买支付信息 -// parameters.put("detail", order.getBody());// 购买支付信息 - parameters.put("out_trade_no", order.getOutTradeNo());// 订单号 + // 购买支付信息 + parameters.put("body", order.getSubject()); + // 购买支付信息 +// parameters.put("detail", order.getBody()); + // 订单号 + parameters.put("out_trade_no", order.getOutTradeNo()); parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getSpbillCreateIp()) ? "192.168.1.150" : order.getSpbillCreateIp() ); - parameters.put("total_fee", Util.conversionCentAmount( order.getPrice()));// 总金额单位为分 + // 总金额单位为分 + parameters.put("total_fee", Util.conversionCentAmount( order.getPrice())); if (StringUtils.isNotEmpty(order.getAddition())){ parameters.put("attach", order.getAddition()); } @@ -366,7 +370,7 @@ public class WxPayService extends BasePayService { public BufferedImage genQrPay(PayOrder order) { Map orderInfo = orderInfo(order); //获取对应的支付账户操作工具（可根据账户id） - if (!SUCCESS.equals(orderInfo.get("result_code"))) { + if (!SUCCESS.equals(orderInfo.get(RESULT_CODE))) { throw new PayErrorException(new WxPayError("-1", (String) orderInfo.get("err_code"))); }