From 7bbd4d441ace9cfab1b2ca9abec475e4fc7feaff Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 14:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E6=95=88=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/AChatCouponController.java | 5 ++--- .../java/com/czg/controller/user/UChatCouponController.java | 4 ++-- .../main/java/com/czg/market/service/ChatCouponService.java | 2 +- .../service/market/service/impl/ChatCouponServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java index 5effa800b..4c1863a64 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AChatCouponController.java @@ -55,10 +55,9 @@ public class AChatCouponController { */ @DeleteMapping("/expired/{id}") @SaAdminCheckPermission(value = "chat:coupon:expired", name = "群聊优惠券活动-失效") - public CzgResult expiredChatCoupon(@PathVariable Long id) { + public CzgResult expiredChatCoupon(@PathVariable Long id) { Long shopId = StpKit.USER.getShopId(); - chatCouponService.expiredChatCoupon(shopId, id); - return CzgResult.success(); + return CzgResult.success(chatCouponService.expiredChatCoupon(shopId, id)); } /** diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java index 8556579c1..d6f754e06 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java @@ -23,8 +23,8 @@ public class UChatCouponController { * 群聊优惠券活动-发放优惠券 */ @PostMapping("/grant") - public CzgResult grantChatCoupon(@RequestBody ChatCouponGrantDTO chatCouponGrant) { + public CzgResult grantChatCoupon(@RequestBody ChatCouponGrantDTO chatCouponGrant) { chatCouponService.grantChatCoupon(chatCouponGrant.getId(), chatCouponGrant.getShopUserId(), chatCouponGrant.getUserId()); - return CzgResult.success(); + return CzgResult.success(true); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java index f3b7f3e2d..7cdf960a5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java @@ -28,7 +28,7 @@ public interface ChatCouponService extends IService { /** * 失效 */ - void expiredChatCoupon(Long shopId, Long id); + boolean expiredChatCoupon(Long shopId, Long id); /** * 发放优惠券 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index c255e475e..ab4e98d70 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -82,10 +82,10 @@ public class ChatCouponServiceImpl extends ServiceImpl