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-13 16:09:02 +08:00
parent dca94cc848
commit 5ef41403e0
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,17 +138,22 @@ public class ACouponController {
/** /**
* 优惠券列表/已领取详情 * 优惠券列表/已领取详情
*
* @param search 用户Id/昵称/手机号 * @param search 用户Id/昵称/手机号
* @param param 用户的优惠券列表 使用该对象的UserId * @param param 用户的优惠券列表 使用该对象的UserId
*/ */
@GetMapping("/record") @GetMapping("/record")
public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(@RequestParam(required = false) String search, MkShopCouponRecordDTO param) { public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(@RequestParam(required = false) String search,
Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(search, param); @RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
MkShopCouponRecordDTO param) {
Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(search, param, startTime, endTime);
return CzgResult.success(data); return CzgResult.success(data);
} }
/** /**
* 删除用户优惠券 * 删除用户优惠券
*
* @param id 优惠券记录Id * @param id 优惠券记录Id
*/ */
@DeleteMapping("/deleteRecord") @DeleteMapping("/deleteRecord")

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

@ -27,16 +27,18 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
/** /**
* 优惠券列表/已领取详情 * 优惠券列表/已领取详情
*
* @param search 用户Id/昵称/手机号 * @param search 用户Id/昵称/手机号
*/ */
Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO param); Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO param, String startTime, String endTime);
/** /**
* 发放券 统一方法 * 发放券 统一方法
*
* @param mkShopCouponRecordDTO 赠送信息 除Id外 几乎全填 * @param mkShopCouponRecordDTO 赠送信息 除Id外 几乎全填
* @param number 发放数量 * @param number 发放数量
*/ */
void receiveCoupon(MkShopCouponRecordDTO mkShopCouponRecordDTO,Integer number); void receiveCoupon(MkShopCouponRecordDTO mkShopCouponRecordDTO, Integer number);
/** /**
* 用户优惠券 失效/删除 * 用户优惠券 失效/删除

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

@ -55,10 +55,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
} }
@Override @Override
public Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO) { public Page<MkShopCouponRecordDTO> getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
Map<Long, UserInfo> userInfoMap = new HashMap<>(); Map<Long, UserInfo> userInfoMap = new HashMap<>();
if (StrUtil.isNotBlank(search)) { if (StrUtil.isNotBlank(search)) {
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
@ -81,6 +79,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
.eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId()) .eq(MkShopCouponRecord::getCouponId, mkShopCouponRecordDTO.getCouponId())
.eq(MkShopCouponRecord::getIsDel, 0) .eq(MkShopCouponRecord::getIsDel, 0)
.eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus()) .eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus())
.between(MkShopCouponRecord::getCreateTime, startTime, endTime)
.orderBy(MkShopCouponRecord::getCreateTime).desc(); .orderBy(MkShopCouponRecord::getCreateTime).desc();
if (CollUtil.isNotEmpty(userInfoMap)) { if (CollUtil.isNotEmpty(userInfoMap)) {
recordQueryWrapper.in(MkShopCouponRecord::getUserId, userInfoMap.keySet()); recordQueryWrapper.in(MkShopCouponRecord::getUserId, userInfoMap.keySet());