返回数据

src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.aliyun.tea.ValidateException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -28,6 +29,7 @@ import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.discSpinning.dao.DiscSpinningRecordDao;
 import com.sqx.modules.discSpinning.entity.DiscSpinningRecord;
+import com.sqx.modules.discSpinning.service.DiscSpinningRecordService;
 import com.sqx.modules.taskCenter.dao.TaskCenterRecordDao;
 import com.sqx.modules.taskCenter.dao.TaskCenterRewardDao;
 import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
@@ -54,6 +56,8 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl<UserPrizeExchangeD
     @Resource
     private DiscSpinningRecordDao discSpinningRecordDao;
     @Resource
+    private DiscSpinningRecordService discSpinningRecordService;
+    @Resource
     private TaskCenterRecordDao taskCenterRecordDao;
     @Resource
     private TaskCenterRewardDao taskCenterRewardDao;
@@ -126,7 +130,10 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl<UserPrizeExchangeD
         }
         Dict dict = Dict.create();
         if ("spinning".equals(dto.getForeignType())) {
-            DiscSpinningRecord record = discSpinningRecordDao.selectById(dto.getForeignId());
+            QueryWrapper<DiscSpinningRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("id", dto.getForeignId());
+            queryWrapper.eq("user_id", currentUserId);
+            DiscSpinningRecord record = discSpinningRecordService.getOne(queryWrapper);
             if (record == null) {
                 throw new SqxException("中奖记录不存在");
             }

src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java

@@ -120,7 +120,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
                         .eq(CourseCollect::getUserId, userId)
                         .eq(CourseCollect::getClassify, classify)
                         .isNotNull(CourseCollect::getCourseId)
-                        .select(CourseCollect::getCourseId, CourseCollect::getUserId))
+                        .select(CourseCollect::getCourseId, CourseCollect::getUserId).groupBy(CourseCollect::getCourseId))
                 .stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());
 //        List<CourseCollect> collectList = baseMapper.selectByUserId(userId, classify);
 //        Set<Long> courseIdList = collectList.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet());

src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java

@@ -41,7 +41,8 @@ public class DiscSpinningRecordController {
     public Result selectDiscSpinningRecord(Integer page, Integer limit, @RequestAttribute("userId") Long userId) {
         PageHelper.startPage(page, limit);
         List<DiscSpinningRecord> list = discSpinningRecordService.list(new QueryWrapper<DiscSpinningRecord>().eq("user_id", userId).orderByDesc("create_time"));
-        return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
+        PageInfo<DiscSpinningRecord> pageInfo = new PageInfo<>(list);
+        PageUtils pageUtils = PageUtils.page(pageInfo, true);
+        return Result.success().put("data", pageUtils);
     }
 }
-

src/main/java/com/sqx/modules/sys/controller/SysLoginController.java

@@ -86,7 +86,7 @@ public class SysLoginController extends AbstractController {
         user.setIsChannel(1);
         user.setQdRate(new BigDecimal("0.01"));
         user.setStatus(1);
-        user.setRoleIdList(Collections.singletonList(4L));
+        user.setRoleIdList(Collections.singletonList("4"));
         ValidatorUtils.validateEntity(user, AddGroup.class);
         user.setUserId(InvitationCodeUtil.getSnowFlakeId());
         sysUserService.saveUser(user);

src/main/java/com/sqx/modules/sys/controller/SysUserController.java

@@ -88,7 +88,7 @@ public class SysUserController extends AbstractController {
 		SysUserEntity user = sysUserService.getById(userId);
 
 		//获取用户所属的角色列表
-		List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
+		List<String> roleIdList = sysUserRoleService.queryRoleIdList(userId);
 		user.setRoleIdList(roleIdList);
 
 		return Result.success().put("user", user);

src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java

@@ -16,7 +16,7 @@ public interface SysUserRoleDao extends BaseMapper<SysUserRoleEntity> {
 	/**
 	 * 根据用户ID，获取角色ID列表
 	 */
-	List<Long> queryRoleIdList(Long userId);
+	List<String> queryRoleIdList(Long userId);
 
 
 	/**

src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java

@@ -72,7 +72,7 @@ public class SysUserEntity implements Serializable {
 	 * 角色ID列表
 	 */
 	@TableField(exist=false)
-	private List<Long> roleIdList;
+	private List<String> roleIdList;
 
 	/**
 	 * 创建者ID

src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java

@@ -13,12 +13,12 @@ import java.util.List;
  */
 public interface SysUserRoleService extends IService<SysUserRoleEntity> {
 
-	void saveOrUpdate(Long userId, List<Long> roleIdList);
+	void saveOrUpdate(Long userId, List<String> roleIdList);
 
 	/**
 	 * 根据用户ID，获取角色ID列表
 	 */
-	List<Long> queryRoleIdList(Long userId);
+	List<String> queryRoleIdList(Long userId);
 
 	/**
 	 * 根据角色ID数组，批量删除

src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserRoleEntity> implements SysUserRoleService {
 
     @Override
-    public void saveOrUpdate(Long userId, List<Long> roleIdList) {
+    public void saveOrUpdate(Long userId, List<String> roleIdList) {
         if (roleIdList == null || roleIdList.isEmpty()) {
             return;
         }
@@ -27,17 +27,17 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
         this.removeByMap(new MapUtils().put("user_id", userId));
 
         //保存用户与角色关系
-        for (Long roleId : roleIdList) {
+        for (String roleId : roleIdList) {
             SysUserRoleEntity sysUserRoleEntity = new SysUserRoleEntity();
             sysUserRoleEntity.setUserId(userId);
-            sysUserRoleEntity.setRoleId(roleId);
+            sysUserRoleEntity.setRoleId(Long.parseLong(roleId));
 
             this.save(sysUserRoleEntity);
         }
     }
 
     @Override
-    public List<Long> queryRoleIdList(Long userId) {
+    public List<String> queryRoleIdList(Long userId) {
         return baseMapper.queryRoleIdList(userId);
     }
 

src/main/resources/mapper/sys/SysUserRoleDao.xml

@@ -10,7 +10,7 @@
 		</foreach>
 	</delete>
 
-	<select id="queryRoleIdList" resultType="long">
+	<select id="queryRoleIdList" resultType="string">
 		select role_id from sys_user_role where user_id = #{value}
 	</select>
 </mapper>