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 4cea0d62..b360ea48 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,17 +138,22 @@ public class ACouponController { /** * 优惠券列表/已领取详情 - * @param search 用户Id/昵称/手机号 + * + * @param search 用户Id/昵称/手机号 * @param param 用户的优惠券列表 使用该对象的UserId */ @GetMapping("/record") - public CzgResult> getRecord(@RequestParam(required = false) String search, MkShopCouponRecordDTO param) { - Page data = couponRecordService.getRecord(search, param); + 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); return CzgResult.success(data); } /** * 删除用户优惠券 + * * @param id 优惠券记录Id */ @DeleteMapping("/deleteRecord") 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 10362f2c..80f0d668 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 @@ -27,16 +27,18 @@ public interface MkShopCouponRecordService extends IService /** * 优惠券列表/已领取详情 + * * @param search 用户Id/昵称/手机号 */ - Page getRecord(String search, MkShopCouponRecordDTO param); + Page getRecord(String search, MkShopCouponRecordDTO param, String startTime, String endTime); /** * 发放券 统一方法 + * * @param mkShopCouponRecordDTO 赠送信息 除Id外 几乎全填 - * @param number 发放数量 + * @param number 发放数量 */ - void receiveCoupon(MkShopCouponRecordDTO mkShopCouponRecordDTO,Integer number); + void receiveCoupon(MkShopCouponRecordDTO mkShopCouponRecordDTO, Integer number); /** * 用户优惠券 失效/删除 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 c3c6b0eb..81852a15 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 @@ -55,10 +55,8 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO) { + public Page getRecord(String search, MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) { Map userInfoMap = new HashMap<>(); if (StrUtil.isNotBlank(search)) { QueryWrapper queryWrapper = new QueryWrapper(); @@ -81,6 +79,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl