From 28f97a96ee7a8b2d7da2777348049862b3c93d41 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 27 Dec 2023 10:59:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=9C=9F=E7=A7=AF=E5=88=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/WxUserMember.java | 17 ++++++++++++++++- .../resources/mapper/WxUserMemberMapper.xml | 9 +++++++-- .../miniProgram/domain/vo/LoginUserVo.java | 18 +++++++++++++++++- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java index 3539560..74c3c12 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java +++ b/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; diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index 0b6db33..a932c1c 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -38,11 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - 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" and headimg = #{headimg} and username like concat('%', #{username}, '%') and credit = #{credit} + and expire_credit = #{expireCredit} and openid = #{openid} and unionid = #{unionid} and user_type = #{userType} @@ -158,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" headimg, username, credit, + expire_credit, openid, unionid, user_type, @@ -189,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{headimg}, #{username}, #{credit}, + #{expireCredit}, #{openid}, #{unionid}, #{userType}, @@ -224,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" headimg = #{headimg}, username = #{username}, credit = #{credit}, + expire_credit = #{expireCredit}, openid = #{openid}, unionid = #{unionid}, user_type = #{userType}, diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java index 2233fe2..c6c7faf 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java +++ b/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; + } }