From d40e0d42fdcdd127e29cc5bee7283f0b889b4054 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 9 Aug 2023 16:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=20update=20=E5=85=B3=E9=97=AD=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=85=85=E5=80=BC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/api/uniapp/PayController.java | 9 ++++++++- .../com/jsowell/adapay/service/AdapayMemberService.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index c9e9dee61..1f01fa8f1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -57,8 +57,11 @@ public class PayController extends BaseController { logger.info("微信支付 param:{}", dto.toString()); RestApiResponse response; try { + if (dto != null) { + throw new BusinessException("00500005", "充值余额功能暂时下线维护，账户已有余额可以继续使用，推荐使用在线支付订单"); + } if (StringUtils.isBlank(dto.getCode()) || StringUtils.isBlank(dto.getAmount())) { - return new RestApiResponse<>(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } // 鉴权 String memberId = getMemberIdByAuthorization(request); @@ -79,7 +82,11 @@ public class PayController extends BaseController { dto.setDescription("会员充值余额"); Map weixinMap = orderService.weixinPayV3(dto); response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap)); + } catch (BusinessException e) { + logger.warn("充值余额支付warn", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { + logger.warn("充值余额支付error", e); response = new RestApiResponse<>(); } return response; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 23361e82c..5070271a3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -83,7 +83,7 @@ public class AdapayMemberService { * @throws Exception */ @Transactional(readOnly = false, propagation = Propagation.REQUIRED) - public void createMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { + public void createMember(SettleAccountDTO dto) throws BaseAdaPayException, BusinessException { AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(dto.getMerchantId()); if (adapayMemberAccount != null) { log.error("通过merchantId:{}, 没有查询到结算账户配置", dto.getMerchantId());