| @@ -208,22 +208,26 @@ public class WxMicroPayController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | 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); | 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 { | try { | ||||
| return wxPayOrderService.payOrderReverse(record); | |||||
| return wxPayOrderService.payOrderReverse(po); | |||||
| } catch (MallinkException e) { | } 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()); | return new ResultData(e.getErrorCode(), e.getMessage()); | ||||
| } catch (Exception e) { | } 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()); | return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); | ||||
| } | } | ||||
| } | } | ||||