314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

Browse Source
master
elliott 2 years ago
parent 818b7c1e44 393cd41a73
commit 5c60459be5
5 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File

76
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
Unescape Escape View File

@ -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() {

13
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java
Unescape Escape View File

@ -68,6 +68,11 @@ public class WxUserMemberVm extends BaseEntity {
*/
private Date birthday;
/**
* 生日
*/
private List<Date> birthdayRange;
/**
* 用户注册起始时间
*/
@ -298,4 +303,12 @@ public class WxUserMemberVm extends BaseEntity {
public void setDevicesIdList(List<Long> devicesIdList) {
this.devicesIdList = devicesIdList;
}
public List<Date> getBirthdayRange() {
return birthdayRange;
}
public void setBirthdayRange(List<Date> birthdayRange) {
this.birthdayRange = birthdayRange;
}
}

5
flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml
Unescape Escape View File

@ -382,6 +382,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cityId != null and cityId != ''"> and member.city_id = #{cityId}</if>
<if test="areaId != null and areaId != ''"> and member.area_id = #{areaId}</if>
<if test="birthday != null "> and member.birthday = #{birthday}</if>
<if test="birthdayRange != null and birthdayRange.size > 0">
and member.birthday &gt;= #{birthdayRange[0]}
and member.birthday &lt;= #{birthdayRange[1]}
</if>
<if test="id!=null and id !=''">
and
<foreach collection="id.split(',')" index="index" item="item" open="(" separator="OR"

6
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -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);

24
flossom-ui/src/views/system/member/index.vue
Unescape Escape View File

@ -102,13 +102,24 @@
<div style="width: 20px"></div>
<div class="mini-label">
<el-form-item label="生日" prop="birthday">
<!-- <el-date-picker-->
<!-- style="width: 126px"-->
<!-- clearable-->
<!-- v-model="queryParams.birthday"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择生日"-->
<!-- >-->
<!-- </el-date-picker>-->
<el-date-picker
style="width: 126px"
clearable
v-model="queryParams.birthday"
type="date"
style="width: 360px"
v-model="queryParams.birthdayRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
value-format="yyyy-MM-dd"
placeholder="请选择生日"
end-placeholder="结束日期"
align="right"
>
</el-date-picker>
</el-form-item>
@ -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,

Write Preview
Loading…
Cancel
Save