zoujiajian 2 лет назад
Родитель
Сommit
f222b0fea0

+ 11 - 2
netflix-web/src/main/java/com/cyksj/web/controller/distribute/DistributeRankController.java

@@ -8,7 +8,9 @@ import com.cyksj.common.constant.Constant;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.UserDistributeRankStatisticsRecordMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
+import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserDistribute;
 import com.cyksj.model.views.*;
 import com.cyksj.web.util.StpUserUtil;
@@ -48,6 +50,8 @@ public class DistributeRankController {
 
 	private final UserDistributeRankStatisticsRecordMapper userDistributeRankStatisticsRecordMapper;
 
+	private final UserMapper userMapper;
+
 	/**
 	 * 分销排行活动详情
 	 */
@@ -63,7 +67,6 @@ public class DistributeRankController {
 			return GatewayResponse.SUCCESS.newBuilder().toResult();
 		}
 		String dateStr = DateTime.now().toString();
-		System.out.println(dateStr);
 		String time = String.format(" and (ua.start_time is null or (ua.start_time < '%s' and ua.end_time > '%s'))", dateStr, dateStr);
 		UserActivityDistributeDetailView view = beanSearcher.searchFirst(UserActivityDistributeDetailView.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(UserActivityDistributeDetailView::getType, 1)
@@ -94,7 +97,13 @@ public class DistributeRankController {
 			statisticsTime = beginOfMonth.toDateStr();
 		}
 
-		DistributeUserRankView self = Optional.ofNullable(userDistributeRankStatisticsRecordMapper.getSelfRank(orderByField, userId, statisticsTime)).orElse(new DistributeUserRankView());
+		DistributeUserRankView self = Optional.ofNullable(userDistributeRankStatisticsRecordMapper.getSelfRank(orderByField, userId, statisticsTime)).orElseGet(()->{
+			DistributeUserRankView distributeUserRankView = new DistributeUserRankView();
+			User user = userMapper.selectById(userId);
+			distributeUserRankView.setNickname(user.getNickname());
+			distributeUserRankView.setHeadimgurl(user.getHeadimgurl());
+			return distributeUserRankView;
+		});
 		distributeUserRankPersonalView.setSelf(self);
 
 		DistributeUserRankView more = userDistributeRankStatisticsRecordMapper.getMoreSelfRank(self.getRankId(), orderByField, statisticsTime);