diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 4cd8b2b15..e99194b09 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -71,7 +71,7 @@ public class TempController extends BaseController { public RestApiResponse tempOrderRefund() { RestApiResponse response = null; try { - orderBasicInfoService.tempOrderRefund(); + // orderBasicInfoService.tempOrderRefund(); response = new RestApiResponse<>(); } catch (BusinessException e) { logger.warn("临时订单退款接口 warn", e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index df149dd05..31abff5c2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1137,10 +1137,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 退款有两种情况 1-订单结算退款 2-用户余额退款 String refundType = dto.getRefundType(); if (StringUtils.equals(refundType, "1")) { - WechatPayRefundResponse response = refundForOrder(dto); + WechatPayRefundResponse response = refundOrderWithWechatPay(dto); logger.info("订单结算退款 result:{}", JSONObject.toJSONString(response)); } else if (StringUtils.equals(refundType, "2")) { - WechatPayRefundResponse response = refundForBalance(dto); + WechatPayRefundResponse response = refundBalanceWithWechatPay(dto); logger.info("用户余额退款 result:{}", JSONObject.toJSONString(response)); } else { logger.warn("没有找到退款处理逻辑"); @@ -1434,9 +1434,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } /** - * 订单退款处理逻辑 + * 微信支付-订单退款处理逻辑 */ - private WechatPayRefundResponse refundForOrder(ApplyRefundDTO dto) { + private WechatPayRefundResponse refundOrderWithWechatPay(ApplyRefundDTO dto) { // 查出来原来的支付信息 WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); if (Objects.isNull(record)) { @@ -1474,11 +1474,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } /** - * 余额退款处理逻辑 - * - * @param dto + * 微信支付-余额退款处理逻辑 */ - private WechatPayRefundResponse refundForBalance(ApplyRefundDTO dto) { + private WechatPayRefundResponse refundBalanceWithWechatPay(ApplyRefundDTO dto) { // 查会员余额 MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(dto.getMemberId()); if (memberVO == null) {