autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 会员信息根据所属一级运营商查询

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-07 16:30:45 +08:00
parent 10e1d7eeb6
commit ed458b875d
4 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java
View File

@@ -146,23 +146,6 @@ public class SecurityUtils {
stationDeptIds.add(deptId);
resultVO.setStationDeptIds(stationDeptIds);
}
// String deptLevel = dept.getDeptLevel();
// if (StringUtils.equals(deptLevel, "0")) {
// // 表明是该账号挂在平台下面，是系统管理员
// } else if (StringUtils.equals(deptLevel, "1")) {
// // 表明是该账号挂在运营商下面，是一级运营商管理员
// merchantDeptIds.add(deptId);
// resultVO.setMerchantDeptIds(merchantDeptIds);
// } else if (StringUtils.equals(deptLevel, "2")) {
// // 表明是该账号挂在运营商下面，是二级运营商管理员
// merchantDeptIds.add(deptId);
// resultVO.setMerchantDeptIds(merchantDeptIds);
// } else {
// // 其他情况，表明是站点管理员
// stationDeptIds.add(deptId);
// resultVO.setStationDeptIds(stationDeptIds);
// }
return resultVO;
}
}

1
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java
View File

@@ -22,6 +22,7 @@ public class QueryMemberInfoDTO {
private String memberId;
// 一级运营商id
private String merchantId;
private List<String> merchantDeptIds;

20
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -3,9 +3,11 @@ package com.jsowell.pile.service.impl;
import com.google.common.collect.Lists;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.MemberBasicInfo;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
@@ -304,15 +306,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
*/
@Override
public List<MemberVO> selectMemberList(QueryMemberInfoDTO dto) {
// // 获取登录账号信息
// AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
// if (authorizedMap == null) {
// return new ArrayList<>();
// }
// List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
// if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
// dto.setMerchantDeptIds(merchantDeptIds);
// }
// 获取登录账号信息
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) {
return new ArrayList<>();
}
List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
dto.setMerchantDeptIds(merchantDeptIds);
}
return memberBasicInfoMapper.selectMemberList(dto);
}

2
jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
View File

@@ -216,7 +216,7 @@
<if test="dto.mobileNumber != null and dto.mobileNumber != ''">and t1.mobile_number like '%${dto.mobileNumber}%'</if>
<if test="dto.nickName != null and dto.nickName != ''">and t1.nick_name like '%${dto.nickName}%'</if>
<if test="dto.memberId != null and dto.memberId != ''">and t1.member_id like '%${dto.memberId}%'</if>
<if test="dto.merchantId != null and dto.merchantId != ''">and t1.merchant_id like '%${dto.merchantId}%'</if>
<if test="dto.merchantId != null and dto.merchantId != ''">and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}</if>
<if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
and t3.dept_id in
<foreach collection="dto.merchantDeptIds" item="deptId" open="(" separator="," close=")">