diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index cf3deba71..0eefbada3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -325,7 +325,7 @@ public class MemberService { dto.setEndDate(lastDay); // 查询会员钱包信息表,获取 本金余额 - MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId()); + MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null); if (memberWalletInfo == null) { // 用户未注册小程序 throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR); 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 a43bc4eff..42aa5f99a 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 @@ -73,7 +73,7 @@ public class MemberBasicInfoController extends BaseController { public RestApiResponse getMerchantListByAuth() { RestApiResponse response = null; List deptIds = getDeptIds(); - List list = memberBasicInfoService.getMerchantListByAuth(deptIds); + List list = memberBasicInfoService.getMerchantListByAuthV2(deptIds); if (CollectionUtils.isEmpty(list)) { list = new ArrayList<>(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java index 9f3b208de..15a5c854c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberWalletInfo; +import org.apache.ibatis.annotations.Param; public interface MemberWalletInfoMapper { /** @@ -51,5 +52,7 @@ public interface MemberWalletInfoMapper { */ int updateByPrimaryKey(MemberWalletInfo record); - MemberWalletInfo selectByMemberId(String memberId); + // MemberWalletInfo selectByMemberId(String memberId); + + MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index d32f49705..0c7c3b768 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -153,4 +153,6 @@ public interface IMemberBasicInfoService { * 获取当前会员中的运营商列表(带权限校验) */ List getMerchantListByAuth(List deptIds); + + List getMerchantListByAuthV2(List deptIds); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java index ac6916a0a..473ffa0f5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java @@ -11,7 +11,7 @@ public interface MemberWalletInfoService { MemberWalletInfo selectByPrimaryKey(Integer id); - MemberWalletInfo selectByMemberId(String memberId); + MemberWalletInfo selectByMemberId(String memberId, String merchantId); int updateByPrimaryKeySelective(MemberWalletInfo record); 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 d807037ac..69e78d271 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 @@ -177,7 +177,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { BigDecimal updatePrincipalBalance = dto.getUpdatePrincipalBalance(); log.info("修改用户余额 memberId:{}, updatePrincipalBalance:{}, updateGiftBalance:{}", memberId, updatePrincipalBalance, updateGiftBalance); // 查询用户余额 - MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId); + MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId, dto.getMerchantId()); if (info == null) { log.warn("根据会员id:{}, 查询会员信息为空", memberId); return 0; @@ -427,5 +427,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return memberBasicInfoMapper.getMerchantListByAuth(deptIds); } + /** + * 获取当前会员中的运营商列表(带权限校验) + */ + @Override + public List getMerchantListByAuthV2(List deptIds) { + // 获取登录用户 所有有权限运营商 + SecurityUtils.getAuthorizedMap(); + return null; + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java index 2b1c79f38..82aa7ca27 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java @@ -34,8 +34,8 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { } @Override - public MemberWalletInfo selectByMemberId(String memberId) { - return memberWalletInfoMapper.selectByMemberId(memberId); + public MemberWalletInfo selectByMemberId(String memberId, String merchantId) { + return memberWalletInfoMapper.selectByMemberId(memberId, merchantId); } @Override 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 599b3136d..411e98ce4 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 @@ -19,6 +19,11 @@ public class UpdateMemberBalanceDTO { */ private String memberId; + /** + * 所属运营商id + */ + private String merchantId; + /** * 更新类型 * 1-进账;2-出账 diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index e5118b5f8..a4f2ef22c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -180,7 +180,8 @@ select from member_wallet_info - where member_id = #{memberId,jdbcType=INTEGER} - and del_flag = '0' + where del_flag = '0' + and member_id = #{memberId,jdbcType=INTEGER} + and merchant_id = #{merchantId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue index 52d122b43..26d83a9b8 100644 --- a/jsowell-ui/src/views/member/info/index.vue +++ b/jsowell-ui/src/views/member/info/index.vue @@ -207,7 +207,20 @@

线下充值本金,客户直接在线下付款给商家

- + + + + + + + 充值 扣款 @@ -320,10 +333,10 @@ export default { }, // 获取运营商列表 getMerchantList() { - // getMerchantList().then((response) =>{ - // console.log("response", response) - // this.merchantList = response.obj - // }) + getMerchantList().then((response) =>{ + console.log("response", response) + this.merchantList = response.obj + }) }, // 取消按钮 cancel() {