From 0e36550c4cdac0457ac34e45052a0c2c876eef61 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 27 Nov 2023 10:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=8C=E6=99=93=E4=BD=99=E9=A2=9D=E5=85=85?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pile/MemberBasicInfoController.java | 3 ++- .../service/impl/MemberBasicInfoServiceImpl.java | 14 ++++++++------ .../pile/vo/web/UpdateMemberBalanceDTO.java | 5 +++++ 3 files changed, 15 insertions(+), 7 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 ef2d01b3c..a8bd3f113 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageHelper; import com.google.common.collect.Lists; import com.jsowell.common.annotation.Log; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.page.TableDataInfo; @@ -190,7 +191,7 @@ public class MemberBasicInfoController extends BaseController { || dto.getUpdatePrincipalBalance() == null) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } - + dto.setFromWeb(Constants.ONE); int i = memberBasicInfoService.updateMemberBalance(dto); if (i > 0) { ajaxResult = AjaxResult.success(ReturnCodeEnum.CODE_SUCCESS.getLabel()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index fafd56c55..f5b6dd47f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -215,12 +215,14 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { String targetMerchantId = dto.getTargetMerchantId(); // 目标运营商id log.info("修改用户余额 memberId:{}, updatePrincipalBalance:{}, targetMerchantId:{}", memberId, updatePrincipalBalance, targetMerchantId); - // 校验权限 - LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); - List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); - List collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); - if (!collect.contains(targetMerchantId)) { - throw new BusinessException(ReturnCodeEnum.CODE_PERMISSION_DENIED); + // 来自后管的充值，校验权限 + if (StringUtils.equals(dto.getFromWeb(), Constants.ONE)) { + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); + List collect = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); + if (!collect.contains(targetMerchantId)) { + throw new BusinessException(ReturnCodeEnum.CODE_PERMISSION_DENIED); + } } // 查询用户余额 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java index 55d787152..6eb50ec23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java @@ -53,6 +53,11 @@ public class UpdateMemberBalanceDTO { */ private String targetMerchantId; + /** + * 来自后管 1-是 + */ + private String fromWeb; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)