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 956aa78e..fef812fc 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 @@ -6,6 +6,7 @@ import com.czg.log.annotation.OperationLog; import com.czg.market.dto.MkCouponGiftDTO; import com.czg.market.dto.ShopCouponDTO; import com.czg.market.service.MkCouponGiftService; +import com.czg.market.service.MkShopConsumerCouponService; import com.czg.market.service.ShopCouponService; import com.czg.product.service.ShopSyncService; import com.czg.resp.CzgResult; @@ -37,6 +38,8 @@ public class ACouponController { private ShopCouponService shopCouponService; @Resource private MkCouponGiftService couponGiftService; + @Resource + private MkShopConsumerCouponService consumerCouponService; @DubboReference private ShopSyncService shopSyncService; @@ -132,16 +135,16 @@ public class ACouponController { return CzgResult.success(data); } - /** - * 通过关联Id取消该券的关联 - * - * @param id /admin/coupon/gifts的 主键Id - */ - @DeleteMapping("/cancelGift") - public CzgResult cancelGift(Long id) { - couponGiftService.cancelGift(id); - return CzgResult.success(); - } +// /** +// * 通过关联Id取消该券的关联 +// * +// * @param id /admin/coupon/gifts的 主键Id +// */ +// @DeleteMapping("/cancelGift") +// public CzgResult cancelGift(Long id) { +// couponGiftService.cancelGift(id); +// return CzgResult.success(); +// } private void asyncToBranchShop(Long id, Integer type) { long shopId = StpKit.USER.getShopId(0L); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java index a6a2660b..fcf214c6 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java @@ -33,6 +33,7 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl getConsumerCouponPage(MkShopConsumerCouponDTO param) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(MkShopConsumerCoupon::getShopId, param.getShopId()) + .eq(MkShopConsumerCoupon::getId, param.getId()) .orderBy(MkShopConsumerCoupon::getCreateTime).desc(); Page pages = pageAs(PageUtil.buildPage(), queryWrapper, MkShopConsumerCouponDTO.class); pages.getRecords().forEach(item -> {