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 2bee4697..178e022f 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 @@ -124,11 +124,20 @@ public class ACouponController { * @param couponId 如果syncId有值 则为syncId 否则为id */ @GetMapping("/gifts") - public CzgResult> getCouponPage(Long couponId) { + public CzgResult> getCouponGiftPage(Long couponId) { Page data = couponGiftService.getCouponGiftPage(couponId); return CzgResult.success(data); } + /** + * 通过关联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-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 71109c0a..385eb153 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 @@ -47,6 +47,12 @@ public interface MkCouponGiftService extends IService { */ void upCouponGift(Long sourceId, String sourceName, Integer type, List couponGiftList); + /** + * 通过关联Id取消该关联关系 + */ + void cancelGift(Long id); + + /** * 删除关联券 * 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 a74da6f1..72ee3cc1 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 @@ -5,7 +5,6 @@ import com.czg.market.dto.MkCouponGiftDTO; import com.czg.market.entity.MkCouponGift; import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkCouponGiftService; -import com.czg.market.service.ShopCouponService; import com.czg.service.market.mapper.MkCouponGiftMapper; import com.czg.service.market.mapper.ShopCouponMapper; import com.czg.utils.PageUtil; @@ -72,6 +71,11 @@ public class MkCouponGiftServiceImpl extends ServiceImpl