用户信息添加过期积分字段

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java

@@ -44,6 +44,12 @@ public class WxUserMember extends BaseEntity {
     @Excel(name = "积分")
     private Integer credit;
 
+    /**
+     * 即将过期积分
+     */
+    @Excel(name = "即将过期积分")
+    private Integer expireCredit;
+
     /**
      * openid
      */
@@ -367,15 +373,24 @@ public class WxUserMember extends BaseEntity {
         this.devicesNum = devicesNum;
     }
 
+    public Integer getExpireCredit() {
+        return expireCredit;
+    }
+
+    public void setExpireCredit(Integer expireCredit) {
+        this.expireCredit = expireCredit;
+    }
+
     public WxUserMember() {
     }
 
-    public WxUserMember(Long id, String nickname, String headimg, String username, Integer credit, String openid, String unionid, Integer userType, Integer level, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, Integer isAbutment, Integer isCompleteInformation, Integer devicesNum, Date loginTime, Integer status) {
+    public WxUserMember(Long id, String nickname, String headimg, String username, Integer credit, Integer expireCredit, String openid, String unionid, Integer userType, Integer level, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, Integer isAbutment, Integer isCompleteInformation, Integer devicesNum, Date loginTime, Integer status) {
         this.id = id;
         this.nickname = nickname;
         this.headimg = headimg;
         this.username = username;
         this.credit = credit;
+        this.expireCredit = expireCredit;
         this.openid = openid;
         this.unionid = unionid;
         this.userType = userType;

flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="headimg"    column="headimg"    />
         <result property="username"    column="username"    />
         <result property="credit"    column="credit"    />
+        <result property="expireCredit"    column="expire_credit"    />
         <result property="openid"    column="openid"    />
         <result property="unionid"    column="unionid"    />
         <result property="userType"    column="user_type"    />
@@ -38,11 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxUserMemberVo">
-        select id, nickname, headimg, username, credit, openid, unionid, user_type, level, mobile, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, is_abutment, login_time, is_complete_information, devices_num, status, create_by, create_time, update_by, update_time, remark from wx_user_member
+        select id, nickname, headimg, username, credit, expire_credit, openid, unionid, user_type, level, mobile, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, is_abutment, login_time, is_complete_information, devices_num, status, create_by, create_time, update_by, update_time, remark from wx_user_member
     </sql>
 
     <sql id="fieldList">
-        member.id, member.nickname, member.headimg, member.username, member.credit, member.openid, member.unionid, member.user_type, member.level, member.mobile,
+        member.id, member.nickname, member.headimg, member.username, member.credit, member.expire_credit, member.openid, member.unionid, member.user_type, member.level, member.mobile,
             member.province_id, member.city_id, member.area_id, member.province, member.city, member.area, member.birthday, member.clock, member.activity,
             member.wechat, member.is_abutment, member.login_time, member.is_complete_information, member.devices_num, member.status, member.create_by,
             member.create_time, member.update_by, member.update_time, member.remark
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headimg != null  and headimg != ''"> and headimg = #{headimg}</if>
             <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
             <if test="credit != null "> and credit = #{credit}</if>
+            <if test="expireCredit != null "> and expire_credit = #{expireCredit}</if>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
             <if test="unionid != null  and unionid != ''"> and unionid = #{unionid}</if>
             <if test="userType != null "> and user_type = #{userType}</if>
@@ -158,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headimg != null">headimg,</if>
             <if test="username != null">username,</if>
             <if test="credit != null">credit,</if>
+            <if test="expireCredit != null">expire_credit,</if>
             <if test="openid != null">openid,</if>
             <if test="unionid != null">unionid,</if>
             <if test="userType != null">user_type,</if>
@@ -189,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headimg != null">#{headimg},</if>
             <if test="username != null">#{username},</if>
             <if test="credit != null">#{credit},</if>
+            <if test="expireCredit != null">#{expireCredit},</if>
             <if test="openid != null">#{openid},</if>
             <if test="unionid != null">#{unionid},</if>
             <if test="userType != null">#{userType},</if>
@@ -224,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="headimg != null">headimg = #{headimg},</if>
             <if test="username != null">username = #{username},</if>
             <if test="credit != null">credit = #{credit},</if>
+            <if test="expireCredit != null">expire_credit = #{expireCredit},</if>
             <if test="openid != null">openid = #{openid},</if>
             <if test="unionid != null">unionid = #{unionid},</if>
             <if test="userType != null">user_type = #{userType},</if>

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java

@@ -36,6 +36,12 @@ public class LoginUserVo {
     @Excel(name = "积分")
     private Integer credit;
 
+    /**
+     * 即将过期积分
+     */
+    @Excel(name = "即将过期积分")
+    private Integer expireCredit;
+
     /**
      * 手机
      */
@@ -96,12 +102,13 @@ public class LoginUserVo {
     public LoginUserVo() {
     }
 
-    public LoginUserVo(Long id, String nickname, String headimg, String username, Integer credit, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, String token) {
+    public LoginUserVo(Long id, String nickname, String headimg, String username, Integer credit, Integer expireCredit, String mobile, Long provinceId, String province, Long cityId, String city, Long areaId, String area, Date birthday, String token, String integralText) {
         this.id = id;
         this.nickname = nickname;
         this.headimg = headimg;
         this.username = username;
         this.credit = credit;
+        this.expireCredit = expireCredit;
         this.mobile = mobile;
         this.provinceId = provinceId;
         this.province = province;
@@ -111,6 +118,7 @@ public class LoginUserVo {
         this.area = area;
         this.birthday = birthday;
         this.token = token;
+        this.integralText = integralText;
     }
 
     public Long getId() {
@@ -232,4 +240,12 @@ public class LoginUserVo {
     public void setIntegralText(String integralText) {
         this.integralText = integralText;
     }
+
+    public Integer getExpireCredit() {
+        return expireCredit;
+    }
+
+    public void setExpireCredit(Integer expireCredit) {
+        this.expireCredit = expireCredit;
+    }
 }