diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java index 0a1739bc..191fad62 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java @@ -138,15 +138,14 @@ public class ACouponController { /** * 优惠券列表/已领取详情 * - * @param search 用户Id/昵称/手机号 - * @param param 用户的优惠券列表 使用该对象的UserId + * @param param 用户的优惠券列表 使用该对象的UserId */ @GetMapping("/record") - public CzgResult> getRecord(@RequestParam(required = false) String search, - @RequestParam(required = false) String startTime, - @RequestParam(required = false) String endTime, - MkShopCouponRecordDTO param) { - Page data = couponRecordService.getRecord(search, param, startTime, endTime); + public CzgResult> getRecord( + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime, + MkShopCouponRecordDTO param) { + Page data = couponRecordService.getRecord(param, startTime, endTime); return CzgResult.success(data); } @@ -171,6 +170,7 @@ public class ACouponController { /** * 券发放 + * * @return 是否发放成功 */ @PostMapping("/grant") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java index 7dcd0d03..074ead27 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java @@ -30,10 +30,8 @@ public interface MkShopCouponRecordService extends IService /** * 优惠券列表/已领取详情 - * - * @param search 用户Id/昵称/手机号 */ - Page getRecord(String search, MkShopCouponRecordDTO param, String startTime, String endTime); + Page getRecord(MkShopCouponRecordDTO param, String startTime, String endTime); /** * 发放券 统一方法 @@ -45,7 +43,6 @@ public interface MkShopCouponRecordService extends IService void receiveCoupon(MkShopCouponGiftDTO giftDTO, Integer number, boolean isLimit); - /** * 用户优惠券 失效/删除 */ diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java index 3bab0714..f77a638c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java @@ -78,24 +78,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) { + public Page getRecord(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) { Map 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 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 recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);