From b4ccc2df657fda6cf6e6324b2cfd1e4eb2a6143d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 12 Aug 2020 13:54:56 +0800 Subject: [PATCH] update --- .../controller/WxMicroPayController.java | 29 ++++++++++++------- .../service/impl/WxPayOrderServiceImpl.java | 3 +- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 9d7c7457a..16c25e4cf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -472,21 +472,28 @@ public class WxMicroPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则"); } - WxPayOrder record = new WxPayOrder(); - record.updateTenantInfo(user); - record.setOrderId(microOrder.getId()); - record.setCUserId(microOrder.getCUserId()); - record.setAuthCode(authCode); - record.setPayAmount(remainPrice); - record.setIp(ipStr); - +// WxPayOrder record = new WxPayOrder(); +// record.updateTenantInfo(user); +// record.setOrderId(microOrder.getId()); +// record.setCUserId(microOrder.getCUserId()); +// record.setAuthCode(authCode); +// record.setPayAmount(remainPrice); +// record.setIp(ipStr); + + WxPayOrder qpo = new WxPayOrder(); + qpo.setOrderId(microOrder.getId()); + WxPayOrder po = wxPayOrderService.getByObj(qpo); + if (null == po) { + return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); + } + try { - return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); + return wxPayOrderService.createMicroPayOrder(user, po, payWay, null); } catch (MallinkException e) { - logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); + logger.error("payment wechat, order create error, req 2: " + po.toString() + ", e:" + e.getMessage(),e); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); + logger.error("payment wechat, order create error, req 3: " + po.toString() + ", e:" + e.getMessage(),e); return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); } } else { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 1d9a917a9..581d68199 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -650,6 +650,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (result.isSuccess()) { record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode()); record.setUpdateTime(new Date()); + record.setFailReason(""); try { wxPayOrderMapper.updateById(record); } catch (Exception e) { @@ -666,7 +667,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { try { verifyPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper<>(verifyPayOrderQ)); } catch (Exception e) { - logger.error(e.getMessage()); + logger.error(e.getMessage(),e); } if (verifyPayOrder != null) { verifyPayOrderQ = new WxPayOrder();