From fe6e21cde911f21c07451380edafaa1ce8e206c7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 5 Dec 2025 17:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=20=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AChatCouponController.java | 10 ++++----- .../czg/market/service/ChatCouponService.java | 6 +++--- .../service/impl/ChatCouponServiceImpl.java | 21 +++++++++++++------ 3 files changed, 23 insertions(+), 14 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 4c1863a64..7e9a06afa 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 @@ -2,8 +2,8 @@ package com.czg.controller.admin; import com.czg.annotation.SaAdminCheckPermission; import com.czg.market.dto.ChatCouponDTO; +import com.czg.market.dto.MkShopCouponRecordDTO; import com.czg.market.entity.ChatCoupon; -import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.service.ChatCouponService; import com.czg.market.vo.ChatCouponVO; import com.czg.resp.CzgResult; @@ -65,10 +65,10 @@ public class AChatCouponController { */ @GetMapping("/record") @SaAdminCheckPermission(value = "chat:coupon:record", name = "群聊优惠券活动-发放记录") - public CzgResult> grantChatCouponRecord(@RequestParam Long id, - @RequestParam(required = false) Integer status, - @RequestParam(required = false, defaultValue = "1") Integer page, - @RequestParam(required = false, defaultValue = "10") Integer size) { + public CzgResult> grantChatCouponRecord(@RequestParam Long id, + @RequestParam(required = false) Integer status, + @RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "10") Integer size) { return CzgResult.success(chatCouponService.grantChatCouponRecord(id, status, page, size)); } 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 9a6e27b36..ab2dd8bb0 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 @@ -1,11 +1,11 @@ package com.czg.market.service; import com.czg.market.dto.ChatCouponDTO; -import com.czg.market.entity.MkShopCouponRecord; +import com.czg.market.dto.MkShopCouponRecordDTO; +import com.czg.market.entity.ChatCoupon; import com.czg.market.vo.ChatCouponVO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; -import com.czg.market.entity.ChatCoupon; /** * 服务层。 @@ -38,5 +38,5 @@ public interface ChatCouponService extends IService { /** * 分页查询优惠券发放记录 */ - Page grantChatCouponRecord(Long id, Integer status, Integer page, Integer size); + Page grantChatCouponRecord(Long id, Integer status, Integer page, Integer size); } 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 a8b2a1ce6..b952a298e 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 @@ -6,17 +6,18 @@ import com.czg.account.service.ShopUserService; import com.czg.exception.CzgException; import com.czg.market.dto.ChatCouponDTO; import com.czg.market.dto.MkShopCouponGiftDTO; +import com.czg.market.dto.MkShopCouponRecordDTO; +import com.czg.market.entity.ChatCoupon; import com.czg.market.entity.MkShopCouponRecord; import com.czg.market.entity.ShopCoupon; +import com.czg.market.service.ChatCouponService; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.ShopCouponService; import com.czg.market.vo.ChatCouponVO; +import com.czg.service.market.mapper.ChatCouponMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.entity.ChatCoupon; -import com.czg.market.service.ChatCouponService; -import com.czg.service.market.mapper.ChatCouponMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -38,6 +39,8 @@ public class ChatCouponServiceImpl extends ServiceImpl grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) { - return recordService.pageAs(Page.of(page, size), + public Page grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) { + Page recordPage = recordService.pageAs(Page.of(page, size), QueryWrapper.create() .eq(MkShopCouponRecord::getSourceId, id) .eq(MkShopCouponRecord::getStatus, status) .orderBy(MkShopCouponRecord::getId).desc(), - MkShopCouponRecord.class); + MkShopCouponRecordDTO.class); + for (MkShopCouponRecordDTO record : recordPage.getRecords()) { + ShopUser userInfo = shopUserService.getById(record.getShopUserId()); + record.setHeadImg(userInfo.getHeadImg()); + record.setNickName(userInfo.getNickName()); + } + return recordPage; } }