From 9ad7d10645f631757ab4163dc301b3f7103fe5e2 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 19 Feb 2024 17:23:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=20401=20=E5=93=8D=E5=BA=94=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniProgram/service/impl/WxUserMemberServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java index 54e0391..109d00f 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java @@ -2,6 +2,7 @@ package com.flossom.miniProgram.service.impl; import com.alibaba.fastjson.JSON; import com.flossom.common.core.constant.CacheConstants; +import com.flossom.common.core.constant.HttpStatus; import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.entity.*; @@ -257,8 +258,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { String openid = loginUser.getWxUserMember().getOpenid(); WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(openid); if (wxUserMember == null) { - logger.error("刷新用户信息失败"); - throw new ServiceException("刷新用户信息失败"); + logger.error("获取用户信息失败，token用户ID：{}， token用户openid：{}，token用户昵称：{}", + loginUser.getWxUserMember().getId(), loginUser.getWxUserMember().getNickname()); + throw new ServiceException("获取用户信息失败", HttpStatus.UNAUTHORIZED); } LoginUserVo loginUserVo = new LoginUserVo(); BeanUtils.copyProperties(wxUserMember, loginUserVo); From 89fb503fb82332dfcd90a023f27e87dac912896b Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 20 Feb 2024 10:19:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D=E3=80=90ID1000418?= =?UTF-8?q?=E3=80=91=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=87=BA=E5=B7=A6=E5=8F=B3=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7=E6=A0=87=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=9D=A5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/export/WxUserMemberExport.java | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java index a529523..6ffc84c 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java @@ -7,87 +7,87 @@ import java.util.List; public class WxUserMemberExport { - /** - * id - */ - @Excel(name = "用户编号") - private Long id; - /** * 昵称 */ - @Excel(name = "会员昵称") + @Excel(name = "会员昵称", sort = 1) private String nickname; /** - * 积分 + * id */ - @Excel(name = "积分") - private Integer credit; + @Excel(name = "用户编号", sort = 2) + private Long id; /** - * 即将过期积分 + * 手机 */ - @Excel(name = "即将过期积分") - private Integer expireCredit; + @Excel(name = "手机号码", sort = 3) + private String mobile; /** - * unionid + * 生日 */ - @Excel(name = "unionid") - private String unionid; + @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd", sort = 4) + private Date birthday; - /** - * 手机 - */ - @Excel(name = "手机号") - private String mobile; /** * 省 */ - @Excel(name = "省") + @Excel(name = "省", sort = 5) private String province; /** * 市 */ - @Excel(name = "市") + @Excel(name = "市", sort = 6) private String city; /** * 区 */ - @Excel(name = "区") + @Excel(name = "区", sort = 7) private String area; /** - * 生日 + * 创建时间 */ - @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthday; - + @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 8) + private Date createTime; /** * 绑定的仪器数量 */ - @Excel(name = "仪器数量") + @Excel(name = "仪器数量", sort = 9) private Integer devicesNum; - @Excel(name = "仪器名称") - private String devicesName; + @Excel(name = "小程序标签", sort = 10) + String miniProgramTags; + + @Excel(name = "外部标签", sort = 11) + String wecomTags; /** - * 创建时间 + * 积分 */ - @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @Excel(name = "积分", sort = 12) + private Integer credit; - @Excel(name = "外部标签") - String wecomTags; + /** + * 即将过期积分 + */ + @Excel(name = "即将过期积分", sort = 13) + private Integer expireCredit; - @Excel(name = "小程序标签") - String miniProgramTags; + /** + * unionid + */ + @Excel(name = "unionid", sort = 14) + private String unionid; + + @Excel(name = "仪器名称", sort = 15) + private String devicesName; public WxUserMemberExport() { From 393cd41a73016eff7a127cef63f7071cc7ec0f8f Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 20 Feb 2024 10:48:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D:=E3=80=90ID1000417?= =?UTF-8?q?=E3=80=91=20=20=20=20=20=20=20=E4=BC=9A=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=90=9C=E7=B4=A2=E7=9A=84=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E6=98=AF=E9=9C=80=E8=A6=81=E6=90=9C=E7=B4=A2=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/req/WxUserMemberVm.java | 13 ++++++++++ .../resources/mapper/WxUserMemberMapper.xml | 5 ++++ flossom-ui/src/views/system/member/index.vue | 24 +++++++++++++++---- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java index 9b360b9..be5e161 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java @@ -68,6 +68,11 @@ public class WxUserMemberVm extends BaseEntity { */ private Date birthday; + /** + * 生日 + */ + private List birthdayRange; + /** * 用户注册起始时间 */ @@ -298,4 +303,12 @@ public class WxUserMemberVm extends BaseEntity { public void setDevicesIdList(List devicesIdList) { this.devicesIdList = devicesIdList; } + + public List getBirthdayRange() { + return birthdayRange; + } + + public void setBirthdayRange(List birthdayRange) { + this.birthdayRange = birthdayRange; + } } 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 8aff65f..7264723 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 @@ -382,6 +382,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and member.city_id = #{cityId} and member.area_id = #{areaId} and member.birthday = #{birthday} + + + and member.birthday >= #{birthdayRange[0]} + and member.birthday <= #{birthdayRange[1]} + and
+ + + + + + + + + @@ -1585,6 +1596,7 @@ export default { areaId: null, area: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null, @@ -1987,6 +1999,7 @@ export default { area: null, areaId: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null, @@ -2031,6 +2044,7 @@ export default { areaId: null, area: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null,