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

优化

This commit is contained in:
wangw 2025-09-26 16:53:34 +08:00
parent 3751056ce8
commit 467c597134
3 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java
View File

@ -138,15 +138,14 @@ public class ACouponController {
/** /**
* 优惠券列表/已领取详情 * 优惠券列表/已领取详情
* *
* @param search 用户Id/昵称/手机号 * @param param 用户的优惠券列表 使用该对象的UserId
* @param param 用户的优惠券列表 使用该对象的UserId
*/ */
@GetMapping("/record") @GetMapping("/record")
public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(@RequestParam(required = false) String search, public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(
@RequestParam(required = false) String startTime, @RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime, @RequestParam(required = false) String endTime,
MkShopCouponRecordDTO param) { MkShopCouponRecordDTO param) {
Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(search, param, startTime, endTime); Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(param, startTime, endTime);
return CzgResult.success(data); return CzgResult.success(data);
} }
@ -171,6 +170,7 @@ public class ACouponController {
/** /**
* 券发放 * 券发放
*
* @return 是否发放成功 * @return 是否发放成功
*/ */
@PostMapping("/grant") @PostMapping("/grant")

5
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
View File

@ -30,10 +30,8 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
/** /**
* 优惠券列表/已领取详情 * 优惠券列表/已领取详情
*
* @param search 用户Id/昵称/手机号
*/ */
Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO param, String startTime, String endTime); Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO param, String startTime, String endTime);
/** /**
* 发放券 统一方法 * 发放券 统一方法
@ -45,7 +43,6 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
void receiveCoupon(MkShopCouponGiftDTO giftDTO, Integer number, boolean isLimit); void receiveCoupon(MkShopCouponGiftDTO giftDTO, Integer number, boolean isLimit);
/** /**
* 用户优惠券 失效/删除 * 用户优惠券 失效/删除
*/ */

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 @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<>(); 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(); QueryWrapper recordQueryWrapper = new QueryWrapper();
recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId()) recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
.eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId()) .eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId())
@ -105,9 +89,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) { if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime); recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime);
} }
if (CollUtil.isNotEmpty(userInfoMap)) { if (mkShopCouponRecordDTO.getUserId() != null) {
recordQueryWrapper.in(MkShopCouponRecord::getUserId, userInfoMap.keySet());
} else if (mkShopCouponRecordDTO.getUserId() != null) {
recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId()); recordQueryWrapper.eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId());
} }
Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class); Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);