autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-10 13:00:02 +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:44:06 +08:00
parent c945a064c1
commit fcddbd6377
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,7 @@ import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.MemberWalletInfo;
import com.jsowell.pile.domain.MemberWalletLog;
import com.jsowell.pile.dto.PlatformTesterDTO; import com.jsowell.pile.dto.PlatformTesterDTO;
import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.QueryMemberInfoDTO;
import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
@@ -22,6 +19,7 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper;
import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper;
import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberVO;
@@ -64,6 +62,10 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;
/** /**
* 查询会员基础信息 * 查询会员基础信息
* *
@@ -315,6 +317,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
if (CollectionUtils.isNotEmpty(merchantDeptIds)) { if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
dto.setMerchantDeptIds(merchantDeptIds); dto.setMerchantDeptIds(merchantDeptIds);
} }
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(authorizedMap.getDeptId());
if (pileMerchantInfo != null) {
String id = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(pileMerchantInfo.getId() + "");
dto.setMerchantId(id);
}
return memberBasicInfoMapper.selectMemberList(dto); return memberBasicInfoMapper.selectMemberList(dto);
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -328,6 +328,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
@Override @Override
public PileMerchantInfo queryInfoByDeptId(String deptId) { public PileMerchantInfo queryInfoByDeptId(String deptId) {
if (StringUtils.isBlank(deptId)) {
return null;
}
return pileMerchantInfoMapper.queryInfoByDeptId(deptId); return pileMerchantInfoMapper.queryInfoByDeptId(deptId);
} }