fix

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

@@ -25,5 +25,5 @@ public interface UserDistributeRankStatisticsRecordMapper extends BaseMapper<Use
 
 	ActivityOrderDataView selectAcOrderDataView(Long acId);
 
-	Page<UserDistributeRankActivityView> rankPage(@Param("nickname") String nickname, @Param("userId") Long userId, @Param("date") String date, @Param("page") Page<UserDistributeRankActivityView> objects, @Param("field") String field, @Param("orderBy") String orderBy, @Param("sort") String sort);
+	Page<UserDistributeRankActivityView> rankPage(@Param("nickname") String nickname, @Param("userId") Long userId, @Param("date") String date, @Param("page") Page<UserDistributeRankActivityView> objects, @Param("filed") String filed, @Param("orderBy") String orderBy, @Param("sort") String sort);
 }

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeRankActivityView.java

@@ -15,17 +15,34 @@ import java.math.BigDecimal;
 @Setter
 public class UserDistributeRankActivityView {
 
+	/**
+	 * 排行
+	 */
+	private Integer rankId;
+
 	private String statisticsStartTime;
 
 	private String statisticsEndTime;
 
 	private Long userId;
 
+	private String nickname;
+
+	private String headimgurl;
+
 	private Integer userNum;
 
 	private Integer orders;
 
 	private BigDecimal money;
 
+	/**
+	 * 奖励明细
+	 */
 	private String reward;
+
+	/**
+	 * 奖励类型
+	 */
+	private String rewardType;
 }

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

@@ -49,10 +49,11 @@
 
     <select id="rankPage" resultType="com.cyksj.model.views.UserDistributeRankActivityView">
         select * from (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.nickname,udsr.nickname) as nickname,
         ifnull(u.headimgurl, udsr.headimgurl) as headimgurl,
         udsr.user_id,
         udsr.statistics_start_time,
+        udsr.statistics_end_time,
         udsr.money,
         udsr.orders,
         udsr.reward_type,
@@ -64,10 +65,10 @@
                 statistics_start_time = #{date}
             </if>
             <if test="userId != null">
-                udsr.user_id = #{userId}
+                and udsr.user_id = #{userId}
             </if>
             <if test="nickname != null">
-                u.nickname like concat('%${nickname}%')
+                and u.nickname like '%${nickname}%'
             </if>
         </where>
         order by ${filed} desc limit 20)