From e1cf4f61c5252e4a298ee059990b47539a510bdc Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 11 Aug 2020 18:15:36 +0800 Subject: [PATCH] update --- .../controller/WxMicroPayController.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index d68a88e1d..9d7c7457a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -208,22 +208,26 @@ public class WxMicroPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - WxPayOrder record = new WxPayOrder(); - record.updateTenantInfo(getTenantInfo()); - record.setId(payOrderId); - record.setPayOrderNo(payOrderIdStr); - record.setBUserId(getUser().getId()); - record.setOrderId(orderId); +// WxPayOrder record = new WxPayOrder(); +// record.updateTenantInfo(getTenantInfo()); +// record.setId(payOrderId); +// record.setPayOrderNo(payOrderIdStr); +// record.setBUserId(getUser().getId()); +// record.setOrderId(orderId); WxPayOrder po = wxPayOrderService.getById(payOrderId); - record.setPayVendor(po.getPayVendor()); + if (null == po) { + return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); + } + + //record.setPayVendor(po.getPayVendor()); try { - return wxPayOrderService.payOrderReverse(record); + return wxPayOrderService.payOrderReverse(po); } catch (MallinkException e) { - logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); + logger.error("payment wechat, order query error, req 2: " + po.toString() + ", e:" + e.getMessage(),e); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); + logger.error("payment wechat, order query error, req 3: " + po.toString() + ", e:" + e.getMessage(),e); return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); } }