Merge branch 'dev-tiande-member' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MemberShareCountRecord.java

@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.entity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -79,6 +76,7 @@ public class MemberShareCountRecord implements Serializable {
     @Column(name = "member_level")
 	@ApiModelProperty(value = "会员等级")
     private Integer memberLevel;
-	
 
+    @Transient
+	private String levelName;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MemberShareRecord.java

@@ -123,4 +123,7 @@ public class MemberShareRecord implements Serializable {
     @Transient
 	private String levelName;
 
+    @Transient
+	private String realName;
+
 }

ace-modules/ace-admin/src/main/resources/mapper/MemberShareCountRecordMapper.xml

@@ -28,8 +28,9 @@
     </insert>
 
     <select id="selectList" resultType="com.github.wxiaoqi.security.admin.entity.MemberShareCountRecord">
-        select msr.count_month as countMonth, msr.user_id as userId, msr.member_level as memberLevel, sum(msr.amount) as amount, aud.realname as realName from member_share_count_record msr
+        select msr.count_month as countMonth, bml.name as levelName, msr.user_id as userId, msr.member_level as memberLevel, sum(msr.amount) as amount, aud.realname as realName from member_share_count_record msr
         LEFT JOIN app_user_detail aud on aud.userid = msr.user_id
+        LEFT JOIN base_user_member_level bml on bml.level = msr.member_level
         <where>
             <if test="userId != null">
                 and  msr.user_id = #{userId}

ace-modules/ace-admin/src/main/resources/mapper/MemberShareRecordMapper.xml

@@ -4,8 +4,9 @@
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.MemberShareRecordMapper">
 
     <select id="selectList" resultType="com.github.wxiaoqi.security.admin.entity.MemberShareRecord">
-        select msr.*,bml.name as levelName from member_share_record msr
+        select msr.*,bml.name as levelName,aud.realname as realName from member_share_record msr
         LEFT JOIN base_user_member_level bml on bml.id = msr.member_level_id
+        LEFT JOIN app_user_detail aud on aud.userid = msr.user_id
         where msr.member_ids like concat('%', #{userId}, '%')
         order by msr.pay_time DESC
     </select>