From cc11e1e403a5369823b0e2f43fb6e8f8ca64d360 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 29 Nov 2023 14:23:01 +0800 Subject: [PATCH] =?UTF-8?q?update=E5=88=9B=E5=BB=BA=E6=B1=87=E4=BB=98?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BC=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pile/MemberBasicInfoController.java | 2 +- .../main/java/com/jsowell/adapay/service/AdapayService.java | 6 +++++- .../pile/service/impl/AdapayMemberAccountServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index de1d05057..dd5e8c035 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -179,7 +179,7 @@ public class MemberBasicInfoController extends BaseController { /** * 充值/扣款余额 */ - @PreAuthorize("@ss.hasPermi('member:balance:update, member:merchantVip:update')") + @PreAuthorize("@ss.hasAnyPermi('member:balance:update, member:merchantVip:update')") @Log(title = "会员充值/扣款余额", businessType = BusinessType.UPDATE) @PutMapping("/updateMemberBalance") public AjaxResult updateMemberBalance(@RequestBody UpdateMemberBalanceDTO dto) { diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index f686a94fe..86478b335 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -652,7 +652,11 @@ public class AdapayService { Map member = CorpMember.create(memberParams, file, config.getWechatAppId()); log.info("创建企业账户param:{}, result:{}", JSON.toJSONString(memberParams), JSON.toJSONString(member)); if (StringUtils.equals((String) member.get("status"), "failed")) { - throw new BusinessException("", (String) member.get("error_msg")); + String error_msg = (String) member.get("error_msg"); + adapayMemberAccount.setStatus(Constants.TWO); // 创建失败，改状态 + adapayMemberAccount.setRemark(error_msg); + adapayMemberAccountService.updateAdapayMemberAccount(adapayMemberAccount); + throw new BusinessException("", error_msg); } // 取消自动创建结算账户，手动创建结算账户 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index f9ac0c8db..f7b0506bc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -77,8 +77,8 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic */ @Override public int updateAdapayMemberAccount(AdapayMemberAccount adapayMemberAccount) { - // adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); - int i = adapayMemberAccountMapper.updateAdapayMemberAccount(adapayMemberAccount); + adapayMemberAccount.setUpdateTime(DateUtils.getNowDate()); + int i = adapayMemberAccountMapper.updateByPrimaryKey(adapayMemberAccount); if (StringUtils.isNotBlank(adapayMemberAccount.getMerchantId())) { String redisKey = CacheConstants.ADAPAY_MEMBER_ACCOUNT + adapayMemberAccount.getMerchantId(); redisCache.deleteObject(redisKey);