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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-09-26 16:57:36 +08:00
parent e9581d9cfd 9313f0f5d5
commit 006dbc8dde
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,24 +78,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
@Override
public Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
public Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
Map<Long, UserInfo> userInfoMap = new HashMap<>();
QueryWrapper queryWrapper = new QueryWrapper();
if (StrUtil.isNotBlank(search)) {
queryWrapper.and(q -> {
q.like(UserInfo::getId, search).or(r -> {
r.like(UserInfo::getNickName, search);
}).or(s -> {
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<>();
}
QueryWrapper recordQueryWrapper = new QueryWrapper();
recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
.eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId())
@@ -105,9 +89,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime);
}
if (CollUtil.isNotEmpty(userInfoMap)) {
recordQueryWrapper.in(MkShopCouponRecord::getUserId, userInfoMap.keySet());
} else if (mkShopCouponRecordDTO.getUserId() != null) {
if (mkShopCouponRecordDTO.getUserId() != null) {
recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId());
}
Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);