记录 用户头像 昵称

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<Page<MkShopCouponRecord>> grantChatCouponRecord(@RequestParam Long id,
+    public CzgResult<Page<MkShopCouponRecordDTO>> grantChatCouponRecord(@RequestParam Long id,
-                                                          @RequestParam(required = false) Integer status,
+                                                                        @RequestParam(required = false) Integer status,
-                                                          @RequestParam(required = false, defaultValue = "1") Integer page,
+                                                                        @RequestParam(required = false, defaultValue = "1") Integer page,
-                                                          @RequestParam(required = false, defaultValue = "10") Integer size) {
+                                                                        @RequestParam(required = false, defaultValue = "10") Integer size) {
         return CzgResult.success(chatCouponService.grantChatCouponRecord(id, status, page, size));
     }
 

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<ChatCoupon> {
      /**
       * 分页查询优惠券发放记录
       */
-    Page<MkShopCouponRecord> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size);
+    Page<MkShopCouponRecordDTO> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size);
 }

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<ChatCouponMapper, ChatCou
     private MkShopCouponRecordService recordService;
     @DubboReference
     private ShopUserService shopUserService;
+//    @DubboReference
+//    private UserInfoService userInfoService;
 
 
     @Override
@@ -147,12 +150,18 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
     }
 
     @Override
-    public Page<MkShopCouponRecord> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) {
+    public Page<MkShopCouponRecordDTO> grantChatCouponRecord(Long id, Integer status, Integer page, Integer size) {
-        return recordService.pageAs(Page.of(page, size),
+        Page<MkShopCouponRecordDTO> 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;
     }
 }