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 178e022f..4eae5fe0 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 @@ -121,16 +121,18 @@ public class ACouponController { /** * 获取该券关联的功能列表 + * * @param couponId 如果syncId有值 则为syncId 否则为id */ @GetMapping("/gifts") - public CzgResult> getCouponGiftPage(Long couponId) { - Page data = couponGiftService.getCouponGiftPage(couponId); + public CzgResult> getCouponGiftPage(@RequestParam Long couponId, @RequestParam(required = false) Integer type) { + Page data = couponGiftService.getCouponGiftPage(couponId, type); return CzgResult.success(data); } /** * 通过关联Id取消该券的关联 + * * @param id /admin/coupon/gifts的 主键Id */ @DeleteMapping("/cancelGift") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkCouponGiftService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkCouponGiftService.java index 385eb153..4bc00270 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkCouponGiftService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkCouponGiftService.java @@ -18,7 +18,7 @@ public interface MkCouponGiftService extends IService { /** * 券关联表查询 */ - Page getCouponGiftPage(Long couponId); + Page getCouponGiftPage(Long couponId, Integer type); /** * 根据sourceId查询关联券 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java index 72ee3cc1..7c7ed7de 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponGiftServiceImpl.java @@ -30,9 +30,10 @@ public class MkCouponGiftServiceImpl extends ServiceImpl getCouponGiftPage(Long couponId) { + public Page getCouponGiftPage(Long couponId, Integer type) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(MkCouponGift::getCouponId, couponId) + .eq(MkCouponGift::getType, type) .orderBy(MkCouponGift::getId).desc(); return pageAs(PageUtil.buildPage(), queryWrapper, MkCouponGiftDTO.class); }