fix

netflix-dao/src/main/java/com/cyksj/mapper/UserActivityRankRobotMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.UserActivityRankRobot;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: UserActivityRankRobotMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/7/24 16:10
+ */
+public interface UserActivityRankRobotMapper extends BaseMapper<UserActivityRankRobot> {
+}

netflix-dao/src/main/java/com/cyksj/mapper/UserActivityRankRootMapper.java

@@ -1,13 +0,0 @@
-package com.cyksj.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.UserActivityRankRoot;
-
-/**
- * 项目名: yhlxj
- * 文件名: UserActivityRankRootMapper
- * 创建者: JavaZou
- * 创建时间:2024/7/24 16:10
- */
-public interface UserActivityRankRootMapper extends BaseMapper<UserActivityRankRoot> {
-}

netflix-dao/src/main/java/com/cyksj/model/entity/UserActivity.java

@@ -99,7 +99,7 @@ public class UserActivity extends BaseEntity {
 	 */
 	@DbIgnore
 	@TableField(exist = false)
-	private List<UserActivityRankRoot> rankRoots;
+	private List<UserActivityRankRobot> rankRobots;
 
 	/**
 	 * 是否删除

netflix-dao/src/main/java/com/cyksj/model/entity/UserActivityRankRoot.java → netflix-dao/src/main/java/com/cyksj/model/entity/UserActivityRankRobot.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 @Getter
 @Setter
-public class UserActivityRankRoot extends BaseEntity{
+public class UserActivityRankRobot extends BaseEntity{
 	private Long acId;
 
 	private String headimgurl;

netflix-dao/src/main/java/com/cyksj/model/entity/UserDistributeRankStatisticsRecord.java

@@ -25,6 +25,11 @@ public class UserDistributeRankStatisticsRecord extends BaseEntity{
 	 */
 	private Long userId;
 
+	/**
+	 * 机器人id
+	 */
+	private Long robotId;
+
 	/**
 	 * 分销用户数
 	 */

netflix-dao/src/main/resources/mapper/UserDistributeRankStatisticsRecordMapper.xml

@@ -15,10 +15,11 @@
                  left join user u on u.id = udsr.user_id
         where udsr.is_present is true
         and statistics_start_time = #{statisticsTime}
+        order by ${filed} desc
     </select>
 
     <select id="getSelfRank" resultType="com.cyksj.model.views.DistributeUserRankView">
-        select ROW_NUMBER()                             OVER (ORDER BY ${filed}) AS rank_id, concat(LEFT(ifnull(u.nickname,udsr.nickname),1),'*', RIGHT(ifnull(u.nickname,udsr.nickname),1)) as nickname,
+        select ROW_NUMBER()                             OVER (ORDER BY ${filed} desc) AS rank_id, concat(LEFT(ifnull(u.nickname,udsr.nickname),1),'*', RIGHT(ifnull(u.nickname,udsr.nickname),1)) as nickname,
                ifnull(u.headimgurl, udsr.headimgurl) as headimgurl,
                udsr.type,
                udsr.user_id,

netflix-service/src/main/java/com/cyksj/service/user/impl/UserActivityServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.UserActivityMapper;
-import com.cyksj.mapper.UserActivityRankRootMapper;
+import com.cyksj.mapper.UserActivityRankRobotMapper;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.UserStudentCertRecordMapper;
 import com.cyksj.model.entity.*;
@@ -36,7 +36,7 @@ public class UserActivityServiceImpl extends ServiceImpl<UserActivityMapper, Use
 
 	private final UserStudentCertRecordMapper userStudentCertRecordMapper;
 
-	private final UserActivityRankRootMapper userActivityRankRootMapper;
+	private final UserActivityRankRobotMapper UserActivityRankRobotMapper;
 	@Override
 	public void sendStudentCertActivity(User user, String dsCode, String school) throws Exception {
 		UserActivity activity = getById(1);
@@ -74,18 +74,18 @@ public class UserActivityServiceImpl extends ServiceImpl<UserActivityMapper, Use
 		}
 		saveOrUpdate(userActivity);
 		if (userActivity.getType() == 1) {
-			List<UserActivityRankRoot> rankRoot = userActivity.getRankRoots();
-			List<Long> collect = rankRoot.stream().filter(e -> e.getId() != null).map(UserActivityRankRoot::getId).collect(Collectors.toList());
-			userActivityRankRootMapper.delete(Wrappers.lambdaQuery(UserActivityRankRoot.class)
-					.eq(UserActivityRankRoot::getAcId, userActivity.getId())
-					.notIn(CollUtil.isNotEmpty(collect), UserActivityRankRoot::getId, collect));
+			List<UserActivityRankRobot> rankRoot = userActivity.getRankRobots();
+			List<Long> collect = rankRoot.stream().filter(e -> e.getId() != null).map(UserActivityRankRobot::getId).collect(Collectors.toList());
+			UserActivityRankRobotMapper.delete(Wrappers.lambdaQuery(UserActivityRankRobot.class)
+					.eq(UserActivityRankRobot::getAcId, userActivity.getId())
+					.notIn(CollUtil.isNotEmpty(collect), UserActivityRankRobot::getId, collect));
 
 			rankRoot.forEach(root -> {
 				root.setAcId(userActivity.getId());
 				if (root.getId() != null) {
-					userActivityRankRootMapper.updateById(root);
+					UserActivityRankRobotMapper.updateById(root);
 				} else {
-					userActivityRankRootMapper.insert(root);
+					UserActivityRankRobotMapper.insert(root);
 				}
 			});
 		}

netflix-web/src/main/java/com/cyksj/web/controller/manage/active/UserActivityController.java

@@ -1,11 +1,13 @@
 package com.cyksj.web.controller.manage.active;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.mapper.UserActivityRankRootMapper;
+import com.cyksj.mapper.UserActivityRankRobotMapper;
 import com.cyksj.model.entity.UserActivity;
-import com.cyksj.model.entity.UserActivityRankRoot;
+import com.cyksj.model.entity.UserActivityRankRobot;
 import com.cyksj.service.user.UserActivityService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -35,7 +37,7 @@ public class UserActivityController {
 
 	private final HttpServletRequest request;
 
-	private final UserActivityRankRootMapper rankRootMapper;
+	private final UserActivityRankRobotMapper rankRootMapper;
 
 	/**
 	 * 新建活动
@@ -76,9 +78,17 @@ public class UserActivityController {
 		SearchResult<UserActivity> search = beanSearcher.search(UserActivity.class, MapUtils.flatBuilder(request.getParameterMap()).field(UserActivity::getDeleted, 1).build());
 		search.getDataList().forEach(e -> {
 			if (e.getType() == 1) {
-				List<UserActivityRankRoot> userActivityRankRoots = rankRootMapper.selectList(Wrappers.lambdaQuery(UserActivityRankRoot.class)
-						.eq(UserActivityRankRoot::getAcId, e.getId()));
-				e.setRankRoots(userActivityRankRoots);
+				List<UserActivityRankRobot> UserActivityRankRobots = rankRootMapper.selectList(Wrappers.lambdaQuery(UserActivityRankRobot.class)
+						.eq(UserActivityRankRobot::getAcId, e.getId()));
+				e.setRankRobots(UserActivityRankRobots);
+
+				try {
+					if (StrUtil.isNotBlank(e.getRewardInfo())) {
+						List<UserActivity.RewardInfo> rewardInfos = Jsons.parseList(e.getRewardInfo(), UserActivity.RewardInfo.class);
+						e.setRewardInfoList(rewardInfos);
+					}
+				} catch (Exception ex) {
+				}
 			}
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);