From 5a53a9b4de14fa0acdbcc681a3e58223c32e1101 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 10 Sep 2018 20:22:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D][=E4=BF=AE=E5=A4=8D]:=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPayOrderServiceImpl.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index e3a8fffdb..fc1197a3f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -228,8 +228,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.info("back to UI: " +returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { + String errMsg = ""; JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -237,7 +244,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } else { // 统一下单 // 服务商模式 @@ -300,8 +307,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.info("back to UI: " +returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { + String errMsg = ""; JSONObject errObj = errorMap.getJSONObject(result_code); - record.setFailReason(errObj.toJSONString()); + if (errObj != null) { + errMsg = errObj.toJSONString(); + record.setFailReason(errMsg); + } else { + errMsg = returnMap.get("return_msg"); + record.setFailReason(errMsg); + } record.setUpdateTime(new Date()); try { wxPayOrderMapper.updateByPrimaryKeySelective(record); @@ -309,7 +323,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order update error: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errObj.toJSONString(), returnMap); + return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); } } } else {