czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

券 失效定时任务 领取列表 头像 名称

Browse Source
This commit is contained in:
wangw
2025-09-26 11:31:15 +08:00
parent 60bcef1e9b
commit e18dbe51d6
4 changed files with 92 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
View File

@@ -80,8 +80,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
@Override
public Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
Map<Long, UserInfo> userInfoMap = new HashMap<>();
QueryWrapper queryWrapper = new QueryWrapper();
if (StrUtil.isNotBlank(search)) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.and(q -> {
q.like(UserInfo::getId, search).or(r -> {
r.like(UserInfo::getNickName, search);
@@ -89,12 +89,12 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
s.like(UserInfo::getPhone, search);
});
});
List<UserInfo> userInfos = userInfoService.list(queryWrapper);
if (CollUtil.isNotEmpty(userInfos)) {
userInfoMap = userInfos.stream().collect(Collectors.toMap(UserInfo::getId, userInfo -> userInfo));
} else {
return new Page<>();
}
}
List<UserInfo> userInfos = userInfoService.list(queryWrapper);
if (CollUtil.isNotEmpty(userInfos)) {
userInfoMap = userInfos.stream().collect(Collectors.toMap(UserInfo::getId, userInfo -> userInfo));
} else {
return new Page<>();
}
QueryWrapper recordQueryWrapper = new QueryWrapper();
recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
@@ -107,7 +107,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
}
if (CollUtil.isNotEmpty(userInfoMap)) {
recordQueryWrapper.in(MkShopCouponRecord::getUserId, userInfoMap.keySet());
} else {
} else if (mkShopCouponRecordDTO.getUserId() != null) {
recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId());
}
Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);
@@ -117,6 +117,18 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
} else if (mkShopCouponRecordDTO.getUserId() != null) {
UserInfo userInfo = userInfoService.getById(mkShopCouponRecordDTO.getUserId());
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
} else {
for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
UserInfo userInfo = userInfoService.getById(record.getUserId());
record.setHeadImg(userInfo.getHeadImg());
record.setNickName(userInfo.getNickName());
}
}
return recordPage;
}