修改查询邀请历史，返回新增用户头像地址

alien-entity/src/main/java/shop/alien/mapper/ActivityInviteLogMapper.java

@@ -1,9 +1,14 @@
 package shop.alien.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
-import shop.alien.entity.store.ActivityInviteConfig;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import shop.alien.entity.store.ActivityInviteLog;
+import shop.alien.entity.store.vo.ActivityInviteLogVo;
 
 /**
  * 邀请活动记录mapper
@@ -11,4 +16,6 @@ import shop.alien.entity.store.ActivityInviteLog;
 @Mapper
 public interface ActivityInviteLogMapper extends BaseMapper<ActivityInviteLog> {
 
+    @Select("select ail.*, lu.user_image  from activity_invite_log ail left join life_user lu on lu.id  = ail.invited_user_id ")
+    IPage<ActivityInviteLogVo> getInviteActivityLogList(IPage<ActivityInviteLog> iPage, @Param(Constants.WRAPPER) QueryWrapper<ActivityInviteLog> wrapper);
 }

alien-store/src/main/java/shop/alien/store/controller/ActivityInviteConfigController.java

@@ -10,10 +10,7 @@ import shop.alien.entity.result.R;
 import shop.alien.entity.store.ActivityInviteConfig;
 import shop.alien.entity.store.ActivityInviteLog;
 import shop.alien.entity.store.ActivitySignInConfig;
-import shop.alien.entity.store.vo.ActivityConfigVo;
-import shop.alien.entity.store.vo.ActivityInviteConfigVo;
-import shop.alien.entity.store.vo.ActivityInviteInfoVo;
-import shop.alien.entity.store.vo.ActivityPeriodVo;
+import shop.alien.entity.store.vo.*;
 import shop.alien.store.service.ActivityConfigService;
 import shop.alien.store.service.ActivityInviteConfigService;
 
@@ -123,10 +120,10 @@ public class ActivityInviteConfigController {
             @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "Integer", paramType = "query")
     })
     @GetMapping("/getInviteActivityLogList")
-    public R<IPage<ActivityInviteLog>> getInviteActivityLogList(@RequestParam(defaultValue = "1") int pageNum,
+    public R<IPage<ActivityInviteLogVo>> getInviteActivityLogList(@RequestParam(defaultValue = "1") int pageNum,
                                                                 @RequestParam(defaultValue = "10") int pageSize,
                                                                 @RequestParam(required = false) Integer userId){
-        IPage<ActivityInviteLog> activityLogList = activityInviteConfigService.getInviteActivityLogList(pageNum, pageSize, userId);
+        IPage<ActivityInviteLogVo> activityLogList = activityInviteConfigService.getInviteActivityLogList(pageNum, pageSize, userId);
         return R.data(activityLogList);
     }
 

alien-store/src/main/java/shop/alien/store/service/ActivityInviteConfigService.java

@@ -3,10 +3,7 @@ package shop.alien.store.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import shop.alien.entity.store.*;
-import shop.alien.entity.store.vo.ActivityConfigVo;
-import shop.alien.entity.store.vo.ActivityInviteConfigVo;
-import shop.alien.entity.store.vo.ActivityInviteInfoVo;
-import shop.alien.entity.store.vo.ActivityPeriodVo;
+import shop.alien.entity.store.vo.*;
 
 import java.util.List;
 
@@ -44,7 +41,7 @@ public interface ActivityInviteConfigService extends IService<ActivityInviteConf
 
     ActivityInviteInfoVo getInviteInfo(Integer userId);
 
-    IPage<ActivityInviteLog> getInviteActivityLogList(int pageNum, int pageSize, Integer status);
+    IPage<ActivityInviteLogVo> getInviteActivityLogList(int pageNum, int pageSize, Integer status);
 
     String bindInviteCode(Integer invitedUserId, String inviteCode);
 

alien-store/src/main/java/shop/alien/store/service/impl/ActivityInviteConfigServiceImpl.java

@@ -2,6 +2,7 @@ package shop.alien.store.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@ import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.ActivityConfigVo;
 import shop.alien.entity.store.vo.ActivityInviteConfigVo;
 import shop.alien.entity.store.vo.ActivityInviteInfoVo;
+import shop.alien.entity.store.vo.ActivityInviteLogVo;
 import shop.alien.mapper.ActivityInviteConfigMapper;
 import shop.alien.mapper.ActivityInviteLogMapper;
 import shop.alien.mapper.LifeUserMapper;
@@ -194,15 +196,15 @@ public class ActivityInviteConfigServiceImpl extends ServiceImpl<ActivityInviteC
     }
 
     @Override
-    public IPage<ActivityInviteLog> getInviteActivityLogList(int pageNum, int pageSize, Integer userId) {
+    public IPage<ActivityInviteLogVo> getInviteActivityLogList(int pageNum, int pageSize, Integer userId) {
 
         IPage<ActivityInviteLog> iPage = new Page<>(pageNum, pageSize);
-        LambdaQueryWrapper<ActivityInviteLog> activityInviteLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<ActivityInviteLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ActivityInviteLog::getDeleteFlag, 0);
         if(userId != null) {
-            activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getInviteUserId, userId);
+            queryWrapper.lambda().eq(ActivityInviteLog::getInviteUserId, userId);
         }
-        activityInviteLogLambdaQueryWrapper.eq(ActivityInviteLog::getDeleteFlag, 0 );
-        return activityInviteLogMapper.selectPage(iPage, activityInviteLogLambdaQueryWrapper);
+        return activityInviteLogMapper.getInviteActivityLogList(iPage, queryWrapper);
     }
 
     @Override