1.添加社员开始时间和到期时间

src/main/java/com/boot/security/server/dto/UsrCommuneExtBean.java

@@ -18,6 +18,8 @@ public class UsrCommuneExtBean {
     private int score;//成绩
     private int score;//成绩
     private int communeYears;//入社年数
     private int communeYears;//入社年数
     private Date lastCommunicationTime;//最后沟通时间
     private Date lastCommunicationTime;//最后沟通时间
+    private Date vipStartTime;//玩家俱乐部开始时间
+    private Date vipExpireTime;//玩家俱乐部到期时间
 
 
 
 
     public Long getId() {
     public Long getId() {
@@ -112,7 +114,7 @@ public class UsrCommuneExtBean {
         if(this.communeAgainTime==null){
         if(this.communeAgainTime==null){
             return null;
             return null;
         }
         }
-        if(communeEndTime==null){
+        if(communeEndTime!=null){
             communeEndTime = DateUtils.addYears(this.communeAgainTime, 1);
             communeEndTime = DateUtils.addYears(this.communeAgainTime, 1);
         }
         }
         return communeEndTime;
         return communeEndTime;
@@ -122,5 +124,25 @@ public class UsrCommuneExtBean {
         this.communeEndTime = communeEndTime;
         this.communeEndTime = communeEndTime;
     }
     }
 
 
+    public Date getVipStartTime() {
+        return vipStartTime;
+    }
+
+    public void setVipStartTime(Date vipStartTime) {
+        this.vipStartTime = vipStartTime;
+    }
 
 
+    public Date getVipExpireTime() {
+        if(this.vipExpireTime==null){
+            return null;
+        }
+        if(vipExpireTime!=null){
+            vipExpireTime = DateUtils.addYears(this.vipExpireTime, 1);
+        }
+        return vipExpireTime;
+    }
+
+    public void setVipExpireTime(Date vipExpireTime) {
+        this.vipExpireTime = vipExpireTime;
+    }
 }
 }

src/main/resources/mybatis-mappers/UsrCommuneExtMapper.xml

@@ -176,7 +176,7 @@
 	</select>
 	</select>
 
 
 	<select id="getBeanById" resultType="com.boot.security.server.dto.UsrCommuneExtBean">
 	<select id="getBeanById" resultType="com.boot.security.server.dto.UsrCommuneExtBean">
-		SELECT a.id,a.Birthday,a.gender,a.mobilePhone,a.score,b.uid,a.userName communeName,b.communeAgainTime,b.communeTime,IFNULL(b.communeYears, 0) AS communeYears,c.lastCommunicationTime
+		SELECT a.id,a.Birthday,a.gender,a.mobilePhone,a.score,b.uid,a.userName communeName,b.communeAgainTime,b.communeTime,IFNULL(b.communeYears, 0) AS communeYears,c.lastCommunicationTime, b.vipStartTime, b.vipExpireTime
 		FROM usr_commune_ext a LEFT JOIN bsc_UserExt b ON a.uid = b.uid LEFT JOIN usr_commune_adm c ON (a.ID=c.communeExtId)
 		FROM usr_commune_ext a LEFT JOIN bsc_UserExt b ON a.uid = b.uid LEFT JOIN usr_commune_adm c ON (a.ID=c.communeExtId)
 		WHERE 1 = 1
 		WHERE 1 = 1
 		<if test="id != null">
 		<if test="id != null">