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 113dc648a0 fe0837c486
commit 8e4f2bc1c1
24 changed files with 700 additions and 390 deletions
Show Stats Download Patch File Download Diff File

12
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/CacheConstants.java
Unescape Escape View File

@ -60,5 +60,15 @@ public class CacheConstants
/** /**
* 微信小程序的 session_key * 微信小程序的 session_key
*/ */
public static final String wx_session_key_cache = "wx_session_key:"; public static final String WX_SESSION_KEY_CACHE = "wx_session_key:";
/**
* 微信小程序 access_token
*/
public static final String WX_ACCESS_TOKEN_CACHE = "wx_access_token_cache:";
/**
* 微信小程序 access_token
*/
public static final long WX_ACCESS_TOKEN_EXPIRATION = 120;
} }

132
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class WxUserMember extends BaseEntity {
private String openid; private String openid;
/** /**
* $column.columnComment * unionid
*/ */
@Excel(name = "unionid") @Excel(name = "unionid")
private String unionid; private String unionid;
@ -75,18 +75,6 @@ public class WxUserMember extends BaseEntity {
@Excel(name = "手机") @Excel(name = "手机")
private String mobile; private String mobile;
/**
* 密码
*/
@Excel(name = "密码")
private String password;
/**
* 个人二维码
*/
@Excel(name = "个人二维码")
private String userQr;
/** /**
* 省id * 省id
*/ */
@ -131,13 +119,13 @@ public class WxUserMember extends BaseEntity {
private Date birthday; private Date birthday;
/** /**
* 1可以2不可以 * 打卡：1可以2不可以
*/ */
@Excel(name = "1可以2不可以") @Excel(name = "1可以2不可以")
private Integer clock; private Integer clock;
/** /**
* 1可以2不可以 * 活动：1可以2不可以
*/ */
@Excel(name = "1可以2不可以") @Excel(name = "1可以2不可以")
private Integer activity; private Integer activity;
@ -148,11 +136,6 @@ public class WxUserMember extends BaseEntity {
@Excel(name = "微信号") @Excel(name = "微信号")
private String wechat; private String wechat;
/**
* 应该是邀请码来的
*/
@Excel(name = "应该是邀请码来的")
private String code;
/** /**
* 1 未对接到中控 2已经对接 3对接失败 * 1 未对接到中控 2已经对接 3对接失败
@ -160,17 +143,16 @@ public class WxUserMember extends BaseEntity {
@Excel(name = "1 未对接到中控 2已经对接 3对接失败") @Excel(name = "1 未对接到中控 2已经对接 3对接失败")
private Integer isAbutment; private Integer isAbutment;
/** /**
* $column.columnComment * 是否完善信息： ：0 未完善 1完善
*/ */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Integer isCompleteInformation;
private BigDecimal collagenDay;
/** /**
* $column.columnComment * 绑定的仪器数量
*/ */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Integer devicesNum;
private BigDecimal collagenMount;
/** /**
* 登陆时间 * 登陆时间
@ -265,22 +247,6 @@ public class WxUserMember extends BaseEntity {
return mobile; return mobile;
} }
public void setPassword(String password) {
this.password = password;
}
public String getPassword() {
return password;
}
public void setUserQr(String userQr) {
this.userQr = userQr;
}
public String getUserQr() {
return userQr;
}
public void setProvince(String province) { public void setProvince(String province) {
this.province = province; this.province = province;
} }
@ -337,13 +303,6 @@ public class WxUserMember extends BaseEntity {
return wechat; return wechat;
} }
public void setCode(String code) {
this.code = code;
}
public String getCode() {
return code;
}
public void setIsAbutment(Integer isAbutment) { public void setIsAbutment(Integer isAbutment) {
this.isAbutment = isAbutment; this.isAbutment = isAbutment;
@ -353,22 +312,6 @@ public class WxUserMember extends BaseEntity {
return isAbutment; return isAbutment;
} }
public void setCollagenDay(BigDecimal collagenDay) {
this.collagenDay = collagenDay;
}
public BigDecimal getCollagenDay() {
return collagenDay;
}
public void setCollagenMount(BigDecimal collagenMount) {
this.collagenMount = collagenMount;
}
public BigDecimal getCollagenMount() {
return collagenMount;
}
public void setLoginTime(Date loginTime) { public void setLoginTime(Date loginTime) {
this.loginTime = loginTime; this.loginTime = loginTime;
} }
@ -409,10 +352,26 @@ public class WxUserMember extends BaseEntity {
this.areaId = areaId; this.areaId = areaId;
} }
public Integer getIsCompleteInformation() {
return isCompleteInformation;
}
public void setIsCompleteInformation(Integer isCompleteInformation) {
this.isCompleteInformation = isCompleteInformation;
}
public Integer getDevicesNum() {
return devicesNum;
}
public void setDevicesNum(Integer devicesNum) {
this.devicesNum = devicesNum;
}
public WxUserMember() { public WxUserMember() {
} }
public WxUserMember(Long id, String nickname, String headimg, String username, BigDecimal credit, String openid, String unionid, Integer userType, Integer level, String mobile, String password, String userQr, String provinceId, String province, String cityId, String city, String areaId, String area, Date birthday, Integer clock, Integer activity, String wechat, String code, Integer isAbutment, BigDecimal collagenDay, BigDecimal collagenMount, Date loginTime, Integer status) { public WxUserMember(Long id, String nickname, String headimg, String username, BigDecimal credit, String openid, String unionid, Integer userType, Integer level, String mobile, String provinceId, String province, String cityId, String city, String 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.id = id;
this.nickname = nickname; this.nickname = nickname;
this.headimg = headimg; this.headimg = headimg;
@ -423,8 +382,6 @@ public class WxUserMember extends BaseEntity {
this.userType = userType; this.userType = userType;
this.level = level; this.level = level;
this.mobile = mobile; this.mobile = mobile;
this.password = password;
this.userQr = userQr;
this.provinceId = provinceId; this.provinceId = provinceId;
this.province = province; this.province = province;
this.cityId = cityId; this.cityId = cityId;
@ -435,45 +392,10 @@ public class WxUserMember extends BaseEntity {
this.clock = clock; this.clock = clock;
this.activity = activity; this.activity = activity;
this.wechat = wechat; this.wechat = wechat;
this.code = code;
this.isAbutment = isAbutment; this.isAbutment = isAbutment;
this.collagenDay = collagenDay; this.isCompleteInformation = isCompleteInformation;
this.collagenMount = collagenMount; this.devicesNum = devicesNum;
this.loginTime = loginTime; this.loginTime = loginTime;
this.status = status; this.status = status;
} }
@Override
public String toString() {
return "WxUserMember{" +
"id=" + id +
", nickname='" + nickname + '\'' +
", headimg='" + headimg + '\'' +
", username='" + username + '\'' +
", credit=" + credit +
", openid='" + openid + '\'' +
", unionid='" + unionid + '\'' +
", userType=" + userType +
", level=" + level +
", mobile='" + mobile + '\'' +
", password='" + password + '\'' +
", userQr='" + userQr + '\'' +
", provinceId='" + provinceId + '\'' +
", province='" + province + '\'' +
", cityId='" + cityId + '\'' +
", city='" + city + '\'' +
", areaId='" + areaId + '\'' +
", area='" + area + '\'' +
", birthday=" + birthday +
", clock=" + clock +
", activity=" + activity +
", wechat='" + wechat + '\'' +
", code='" + code + '\'' +
", isAbutment=" + isAbutment +
", collagenDay=" + collagenDay +
", collagenMount=" + collagenMount +
", loginTime=" + loginTime +
", status=" + status +
'}';
}
} }

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

@ -0,0 +1,203 @@
package com.flossom.common.core.domain.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.flossom.common.core.annotation.Excel;
import com.flossom.common.core.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
/**
* 微信用户查询对象
*
* @author flossom
* @date 2023-12-08
*/
public class WxUserMemberVm {
/**
* 用户编码
*/
private Long id;
/**
* 会员昵称
*/
@Excel(name = "会员昵称")
private String nickname;
/**
* 积分起始
*/
@Excel(name = "积分")
private Integer creditStart;
/**
* 积分结束
*/
private Integer creditEnd;
/**
* 用户类型：0游客 1会员
*/
@Excel(name = "用户类型：0游客 1会员")
private Integer userType;
/**
* 手机（多个手机号码，‘，’逗号隔开，号码数不足时，模糊匹配）
*/
@Excel(name = "手机")
private String mobile;
/**
* 省id
*/
@Excel(name = "省id")
private String provinceId;
/**
* 市id
*/
@Excel(name = "市id")
private String cityId;
/**
* 区id
*/
@Excel(name = "区id")
private String areaId;
/**
* 生日
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 用户注册起始时间
*/
private Date createTimeStart;
/**
* 用户注册结束时间
*/
private Date createTimeEnd;
public WxUserMemberVm() {
}
public WxUserMemberVm(Long id, String nickname, Integer creditStart, Integer creditEnd, Integer userType, String mobile, String provinceId, String cityId, String areaId, Date birthday, Date createTimeStart, Date createTimeEnd) {
this.id = id;
this.nickname = nickname;
this.creditStart = creditStart;
this.creditEnd = creditEnd;
this.userType = userType;
this.mobile = mobile;
this.provinceId = provinceId;
this.cityId = cityId;
this.areaId = areaId;
this.birthday = birthday;
this.createTimeStart = createTimeStart;
this.createTimeEnd = createTimeEnd;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getNickname() {
return nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
public Integer getCreditStart() {
return creditStart;
}
public void setCreditStart(Integer creditStart) {
this.creditStart = creditStart;
}
public Integer getCreditEnd() {
return creditEnd;
}
public void setCreditEnd(Integer creditEnd) {
this.creditEnd = creditEnd;
}
public Integer getUserType() {
return userType;
}
public void setUserType(Integer userType) {
this.userType = userType;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getProvinceId() {
return provinceId;
}
public void setProvinceId(String provinceId) {
this.provinceId = provinceId;
}
public String getCityId() {
return cityId;
}
public void setCityId(String cityId) {
this.cityId = cityId;
}
public String getAreaId() {
return areaId;
}
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public Date getBirthday() {
return birthday;
}
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
public Date getCreateTimeStart() {
return createTimeStart;
}
public void setCreateTimeStart(Date createTimeStart) {
this.createTimeStart = createTimeStart;
}
public Date getCreateTimeEnd() {
return createTimeEnd;
}
public void setCreateTimeEnd(Date createTimeEnd) {
this.createTimeEnd = createTimeEnd;
}
}

3
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserIntegralLogMapper.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.flossom.common.core.mapper; package com.flossom.common.core.mapper;
import com.flossom.common.core.domain.entity.WxUserIntegralLog; import com.flossom.common.core.domain.entity.WxUserIntegralLog;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -59,4 +60,6 @@ public interface WxUserIntegralLogMapper
* @return 结果 * @return 结果
*/ */
public int deleteWxUserIntegralLogByIds(Long[] ids); public int deleteWxUserIntegralLogByIds(Long[] ids);
List<WxUserIntegralLog> obtainUserIntegral(@Param("userId") Long userId);
} }

3
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.flossom.common.core.mapper;
import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -72,4 +73,6 @@ public interface WxUserMemberMapper {
WxUserMember selectWxUserMemberByOpenId(@Param("openid") String openid); WxUserMember selectWxUserMemberByOpenId(@Param("openid") String openid);
void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id); void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id);
List<WxUserMember> selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm);
} }

8
flossom-common/flossom-common-core/src/main/resources/mapper/WxUserIntegralLogMapper.xml
Unescape Escape View File

@ -39,6 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</select> </select>
<select id="obtainUserIntegral" resultType="com.flossom.common.core.domain.entity.WxUserIntegralLog">
<include refid="selectWxUserIntegralLogVo"/>
WHERE
user_id = #{userId}
ORDER BY
create_time DESC
</select>
<insert id="insertWxUserIntegralLog" parameterType="WxUserIntegralLog" useGeneratedKeys="true" keyProperty="id"> <insert id="insertWxUserIntegralLog" parameterType="WxUserIntegralLog" useGeneratedKeys="true" keyProperty="id">
insert into wx_user_integral_log insert into wx_user_integral_log
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

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

@ -15,8 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="userType" column="user_type" /> <result property="userType" column="user_type" />
<result property="level" column="level" /> <result property="level" column="level" />
<result property="mobile" column="mobile" /> <result property="mobile" column="mobile" />
<result property="password" column="password" />
<result property="userQr" column="user_qr" />
<result property="provinceId" column="province_id" /> <result property="provinceId" column="province_id" />
<result property="cityId" column="city_id" /> <result property="cityId" column="city_id" />
<result property="areaId" column="area_id" /> <result property="areaId" column="area_id" />
@ -27,10 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="clock" column="clock" /> <result property="clock" column="clock" />
<result property="activity" column="activity" /> <result property="activity" column="activity" />
<result property="wechat" column="wechat" /> <result property="wechat" column="wechat" />
<result property="code" column="code" />
<result property="isAbutment" column="is_abutment" /> <result property="isAbutment" column="is_abutment" />
<result property="collagenDay" column="collagen_day" /> <result property="isCompleteInformation" column="is_complete_information" />
<result property="collagenMount" column="collagen_mount" /> <result property="devicesNum" column="devices_num" />
<result property="loginTime" column="login_time" /> <result property="loginTime" column="login_time" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
@ -41,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectWxUserMemberVo"> <sql id="selectWxUserMemberVo">
select id, nickname, headimg, username, credit, openid, unionid, user_type, level, mobile, password, user_qr, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, code, is_abutment, collagen_day, collagen_mount, login_time, status, create_by, create_time, update_by, update_time, remark from wx_user_member 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
</sql> </sql>
<select id="selectWxUserMemberList" parameterType="WxUserMember" resultMap="WxUserMemberResult"> <select id="selectWxUserMemberList" parameterType="WxUserMember" resultMap="WxUserMemberResult">
@ -56,8 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userType != null "> and user_type = #{userType}</if> <if test="userType != null "> and user_type = #{userType}</if>
<if test="level != null "> and level = #{level}</if> <if test="level != null "> and level = #{level}</if>
<if test="mobile != null and mobile != ''"> and mobile = #{mobile}</if> <if test="mobile != null and mobile != ''"> and mobile = #{mobile}</if>
<if test="password != null and password != ''"> and password = #{password}</if>
<if test="userQr != null and userQr != ''"> and user_qr = #{userQr}</if>
<if test="provinceId != null and provinceId != ''"> and province = #{provinceId}</if> <if test="provinceId != null and provinceId != ''"> and province = #{provinceId}</if>
<if test="cityId != null and cityId != ''"> and city = #{cityId}</if> <if test="cityId != null and cityId != ''"> and city = #{cityId}</if>
<if test="areaId != null and areaId != ''"> and area = #{areaId}</if> <if test="areaId != null and areaId != ''"> and area = #{areaId}</if>
@ -68,11 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="clock != null "> and clock = #{clock}</if> <if test="clock != null "> and clock = #{clock}</if>
<if test="activity != null "> and activity = #{activity}</if> <if test="activity != null "> and activity = #{activity}</if>
<if test="wechat != null and wechat != ''"> and wechat = #{wechat}</if> <if test="wechat != null and wechat != ''"> and wechat = #{wechat}</if>
<if test="code != null and code != ''"> and code = #{code}</if>
<if test="isAbutment != null "> and is_abutment = #{isAbutment}</if> <if test="isAbutment != null "> and is_abutment = #{isAbutment}</if>
<if test="collagenDay != null "> and collagen_day = #{collagenDay}</if>
<if test="collagenMount != null "> and collagen_mount = #{collagenMount}</if>
<if test="loginTime != null "> and login_time = #{loginTime}</if> <if test="loginTime != null "> and login_time = #{loginTime}</if>
<if test="isCompleteInformation != null "> and is_complete_information = #{isCompleteInformation}</if>
<if test="devicesNum != null "> and devices_num = #{devicesNum}</if>
<if test="status != null "> and status = #{status}</if> <if test="status != null "> and status = #{status}</if>
</where> </where>
</select> </select>
@ -87,6 +81,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE openid = #{openid} WHERE openid = #{openid}
</select> </select>
<select id="selectWxUserMemberListByVm" parameterType="WxUserMemberVm" resultMap="WxUserMemberResult">
<include refid="selectWxUserMemberVo"/>
<where>
<if test="id != null" >id = #{id}</if>
<if test="nickname != null and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
<if test="creditStart != null and creditEnd != null"> and credit &gt;= #{creditStart} and credit &lt;= #{creditEnd}</if>
<if test="userType != null "> and user_type = #{userType}</if>
<if test="mobile != null and mobile != ''"> and mobile = #{mobile}</if>
<if test="provinceId != null and provinceId != ''"> and province = #{provinceId}</if>
<if test="cityId != null and cityId != ''"> and city = #{cityId}</if>
<if test="areaId != null and areaId != ''"> and area = #{areaId}</if>
<if test="birthday != null "> and birthday = #{birthday}</if>
and status = 0
</where>
</select>
<insert id="insertWxUserMember" parameterType="WxUserMember" useGeneratedKeys="true" keyProperty="id"> <insert id="insertWxUserMember" parameterType="WxUserMember" useGeneratedKeys="true" keyProperty="id">
insert into wx_user_member insert into wx_user_member
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -99,8 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userType != null">user_type,</if> <if test="userType != null">user_type,</if>
<if test="level != null">level,</if> <if test="level != null">level,</if>
<if test="mobile != null">mobile,</if> <if test="mobile != null">mobile,</if>
<if test="password != null">password,</if>
<if test="userQr != null">user_qr,</if>
<if test="provinceId != null">province_id,</if> <if test="provinceId != null">province_id,</if>
<if test="cityId != null">city_id,</if> <if test="cityId != null">city_id,</if>
<if test="areaId != null">area_id,</if> <if test="areaId != null">area_id,</if>
@ -111,10 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="clock != null">clock,</if> <if test="clock != null">clock,</if>
<if test="activity != null">activity,</if> <if test="activity != null">activity,</if>
<if test="wechat != null">wechat,</if> <if test="wechat != null">wechat,</if>
<if test="code != null">code,</if>
<if test="isAbutment != null">is_abutment,</if> <if test="isAbutment != null">is_abutment,</if>
<if test="collagenDay != null">collagen_day,</if> <if test="isCompleteInformation != null">is_complete_information,</if>
<if test="collagenMount != null">collagen_mount,</if> <if test="devicesNum != null">devices_num,</if>
<if test="loginTime != null">login_time,</if> <if test="loginTime != null">login_time,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
@ -133,8 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userType != null">#{userType},</if> <if test="userType != null">#{userType},</if>
<if test="level != null">#{level},</if> <if test="level != null">#{level},</if>
<if test="mobile != null">#{mobile},</if> <if test="mobile != null">#{mobile},</if>
<if test="password != null">#{password},</if>
<if test="userQr != null">#{userQr},</if>
<if test="provinceId != null">#{provinceId},</if> <if test="provinceId != null">#{provinceId},</if>
<if test="cityId != null">#{cityId},</if> <if test="cityId != null">#{cityId},</if>
<if test="areaId != null">#{areaId},</if> <if test="areaId != null">#{areaId},</if>
@ -145,10 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="clock != null">#{clock},</if> <if test="clock != null">#{clock},</if>
<if test="activity != null">#{activity},</if> <if test="activity != null">#{activity},</if>
<if test="wechat != null">#{wechat},</if> <if test="wechat != null">#{wechat},</if>
<if test="code != null">#{code},</if>
<if test="isAbutment != null">#{isAbutment},</if> <if test="isAbutment != null">#{isAbutment},</if>
<if test="collagenDay != null">#{collagenDay},</if> <if test="isCompleteInformation != null">#{isCompleteInformation},</if>
<if test="collagenMount != null">#{collagenMount},</if> <if test="devicesNum != null">#{devicesNum},</if>
<if test="loginTime != null">#{loginTime},</if> <if test="loginTime != null">#{loginTime},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
@ -171,8 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userType != null">user_type = #{userType},</if> <if test="userType != null">user_type = #{userType},</if>
<if test="level != null">level = #{level},</if> <if test="level != null">level = #{level},</if>
<if test="mobile != null">mobile = #{mobile},</if> <if test="mobile != null">mobile = #{mobile},</if>
<if test="password != null">password = #{password},</if>
<if test="userQr != null">user_qr = #{userQr},</if>
<if test="provinceId != null">province_id = #{provinceId},</if> <if test="provinceId != null">province_id = #{provinceId},</if>
<if test="cityId != null">city_id = #{cityId},</if> <if test="cityId != null">city_id = #{cityId},</if>
<if test="areaId != null">area_id = #{areaId},</if> <if test="areaId != null">area_id = #{areaId},</if>
@ -183,11 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="clock != null">clock = #{clock},</if> <if test="clock != null">clock = #{clock},</if>
<if test="activity != null">activity = #{activity},</if> <if test="activity != null">activity = #{activity},</if>
<if test="wechat != null">wechat = #{wechat},</if> <if test="wechat != null">wechat = #{wechat},</if>
<if test="code != null">code = #{code},</if>
<if test="isAbutment != null">is_abutment = #{isAbutment},</if> <if test="isAbutment != null">is_abutment = #{isAbutment},</if>
<if test="collagenDay != null">collagen_day = #{collagenDay},</if>
<if test="collagenMount != null">collagen_mount = #{collagenMount},</if>
<if test="loginTime != null">login_time = #{loginTime},</if> <if test="loginTime != null">login_time = #{loginTime},</if>
<if test="isCompleteInformation != null">is_complete_information = #{isCompleteInformation},</if>
<if test="devicesNum != null">devices_num = #{devicesNum},</if>
<if test="status != null">status = #{status},</if> <if test="status != null">status = #{status},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

20
flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.security.utils.SecurityUtils; import com.flossom.common.security.utils.SecurityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -151,6 +152,10 @@ public class TokenService
if (expireTime - currentTime <= MILLIS_MINUTE_TEN) if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
{ {
refreshToken(loginUser); refreshToken(loginUser);
// 判断是否是微信用户
if(loginUser.getWxUserMember() != null) {
refreshSessionKey(loginUser);
}
} }
} }
@ -168,6 +173,21 @@ public class TokenService
redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
} }
/**
* 刷新session_key有效期
*
* @param loginUser 登录信息
*/
public void refreshSessionKey(LoginUser loginUser)
{
WxUserMember wxUserMember = loginUser.getWxUserMember();
String sessionKey = redisService.getCacheObject(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid());
if(StringUtils.isNotBlank(sessionKey)) {
redisService.setCacheObject(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid(),
sessionKey, CacheConstants.EXPIRATION, TimeUnit.MINUTES);
}
}
private String getTokenKey(String token) private String getTokenKey(String token)
{ {
return ACCESS_TOKEN + token; return ACCESS_TOKEN + token;

11
flossom-modules/flossom-mini-program/pom.xml
Unescape Escape View File

@ -91,6 +91,17 @@
<version>4.5.2</version> <version>4.5.2</version>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

11
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/config/properties/WxConfig.java
Unescape Escape View File

@ -25,6 +25,9 @@ public class WxConfig {
*/ */
private String obtainPhoneUrl; private String obtainPhoneUrl;
private String accessTokenUrl;
public String getLoginUrl() { public String getLoginUrl() {
return loginUrl; return loginUrl;
} }
@ -40,4 +43,12 @@ public class WxConfig {
public void setObtainPhoneUrl(String obtainPhoneUrl) { public void setObtainPhoneUrl(String obtainPhoneUrl) {
this.obtainPhoneUrl = obtainPhoneUrl; this.obtainPhoneUrl = obtainPhoneUrl;
} }
public String getAccessTokenUrl() {
return accessTokenUrl;
}
public void setAccessTokenUrl(String accessTokenUrl) {
this.accessTokenUrl = accessTokenUrl;
}
} }

3
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java
Unescape Escape View File

@ -36,8 +36,7 @@ public class UserMemberController extends BaseController {
*/ */
@PostMapping("/upgradeMember") @PostMapping("/upgradeMember")
public AjaxResult upgradeMember(@RequestParam(value = "code") String code) throws Exception { public AjaxResult upgradeMember(@RequestParam(value = "code") String code) throws Exception {
wxUserMemberService.upgradeMember(code); return AjaxResult.success("获取成功", wxUserMemberService.upgradeMember(code));
return AjaxResult.success();
} }
/** /**

39
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegraController.java
Unescape Escape View File

@ -0,0 +1,39 @@
package com.flossom.miniProgram.controller;
import com.flossom.common.core.domain.entity.WxUserIntegralLog;
import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult;
import com.flossom.common.core.web.page.TableDataInfo;
import com.flossom.miniProgram.service.IWxUserIntegralService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 微信用户积分 Controller
*
* @author flossom
* @date 2023-12-14
*/
@RestController
@RequestMapping("/integralLog")
public class WxUserIntegraController extends BaseController {
@Autowired
private IWxUserIntegralService wxUserIntegralLogService;
/**
* 获取用户积分列表
*
* @return
*/
@GetMapping("/obtainUserIntegral")
public TableDataInfo obtainUserIntegral() {
startPage();
List<WxUserIntegralLog> list = wxUserIntegralLogService.obtainUserIntegral();
return getDataTable(list);
}
}

64
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxAccessTokenRet.java
Unescape Escape View File

@ -0,0 +1,64 @@
package com.flossom.miniProgram.domain.vo;
/**
* 登录响应结果
*/
public class WxAccessTokenRet {
private String access_token;
private String expires_in;
private Integer errcode;
private String errmsg;
public WxAccessTokenRet() {
}
public WxAccessTokenRet(String access_token, String expires_in, Integer errcode, String errmsg) {
this.access_token = access_token;
this.expires_in = expires_in;
this.errcode = errcode;
this.errmsg = errmsg;
}
public String getAccess_token() {
return access_token;
}
public void setAccess_token(String access_token) {
this.access_token = access_token;
}
public String getExpires_in() {
return expires_in;
}
public void setExpires_in(String expires_in) {
this.expires_in = expires_in;
}
public Integer getErrcode() {
return errcode;
}
public void setErrcode(Integer errcode) {
this.errcode = errcode;
}
public String getErrmsg() {
return errmsg;
}
public void setErrmsg(String errmsg) {
this.errmsg = errmsg;
}
@Override
public String toString() {
return "WxAccessTokenRet{" +
"access_token='" + access_token + '\'' +
", expires_in='" + expires_in + '\'' +
", errcode=" + errcode +
", errmsg='" + errmsg + '\'' +
'}';
}
}

19
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/WxCode2PhoneRet.java
Unescape Escape View File

@ -5,25 +5,25 @@ package com.flossom.miniProgram.domain.vo;
*/ */
public class WxCode2PhoneRet { public class WxCode2PhoneRet {
private PhoneInfo phoneInfo; private PhoneInfo phone_info;
private Integer errcode; private Integer errcode;
private String errmsg; private String errmsg;
public WxCode2PhoneRet() { public WxCode2PhoneRet() {
} }
public WxCode2PhoneRet(PhoneInfo phoneInfo, Integer errcode, String errmsg) { public WxCode2PhoneRet(PhoneInfo phone_info, Integer errcode, String errmsg) {
this.phoneInfo = phoneInfo; this.phone_info = phone_info;
this.errcode = errcode; this.errcode = errcode;
this.errmsg = errmsg; this.errmsg = errmsg;
} }
public PhoneInfo getPhoneInfo() { public PhoneInfo getPhoneInfo() {
return phoneInfo; return phone_info;
} }
public void setPhoneInfo(PhoneInfo phoneInfo) { public void setPhoneInfo(PhoneInfo phoneInfo) {
this.phoneInfo = phoneInfo; this.phone_info = phoneInfo;
} }
public Integer getErrcode() { public Integer getErrcode() {
@ -41,4 +41,13 @@ public class WxCode2PhoneRet {
public void setErrmsg(String errmsg) { public void setErrmsg(String errmsg) {
this.errmsg = errmsg; this.errmsg = errmsg;
} }
@Override
public String toString() {
return "WxCode2PhoneRet{" +
"phoneInfo=" + phone_info +
", errcode=" + errcode +
", errmsg='" + errmsg + '\'' +
'}';
}
} }

11
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserIntegralService.java
Unescape Escape View File

@ -0,0 +1,11 @@
package com.flossom.miniProgram.service;
import com.flossom.common.core.domain.entity.WxUserIntegralLog;
import java.util.List;
public interface IWxUserIntegralService {
List<WxUserIntegralLog> obtainUserIntegral();
}

2
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java
Unescape Escape View File

@ -8,7 +8,7 @@ public interface IWxUserMemberService {
LoginUserVo login(String code) throws Exception; LoginUserVo login(String code) throws Exception;
void upgradeMember(String code) throws Exception; String upgradeMember(String code) throws Exception;
void updateUser(UserMemberUpdateVo userMemberUpdateVo); void updateUser(UserMemberUpdateVo userMemberUpdateVo);
} }

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

@ -0,0 +1,25 @@
package com.flossom.miniProgram.service.impl;
import com.flossom.common.core.domain.entity.WxUserIntegralLog;
import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.mapper.WxUserIntegralLogMapper;
import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.miniProgram.service.IWxUserIntegralService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class WxUserIntegralServiceImpl implements IWxUserIntegralService {
@Autowired
private WxUserIntegralLogMapper wxUserIntegralLogMapper;
@Override
public List<WxUserIntegralLog> obtainUserIntegral() {
WxUserMember wxUserMember = SecurityUtils.getLoginUser().getWxUserMember();
return wxUserIntegralLogMapper.obtainUserIntegral(wxUserMember.getId());
}
}

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

@ -1,29 +1,21 @@
package com.flossom.miniProgram.service.impl; package com.flossom.miniProgram.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.flossom.common.core.constant.CacheConstants; import com.flossom.common.core.constant.CacheConstants;
import com.flossom.common.core.constant.UserConstants; import com.flossom.common.core.constant.UserConstants;
import com.flossom.common.core.domain.LoginBody;
import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.R;
import com.flossom.common.core.domain.RegisterBody; import com.flossom.common.core.domain.RegisterBody;
import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.exception.ServiceException; import com.flossom.common.core.exception.ServiceException;
import com.flossom.common.core.mapper.WxUserMemberMapper; import com.flossom.common.core.mapper.WxUserMemberMapper;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.redis.service.RedisService; import com.flossom.common.redis.service.RedisService;
import com.flossom.common.security.utils.SecurityUtils; import com.flossom.common.security.utils.SecurityUtils;
import com.flossom.miniProgram.domain.vo.LoginUserVo; import com.flossom.miniProgram.domain.vo.*;
import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
import com.flossom.miniProgram.domain.vo.WxCode2PhoneRet;
import com.flossom.miniProgram.domain.vo.WxCode2SessionRet;
import com.flossom.miniProgram.service.IWxUserMemberService; import com.flossom.miniProgram.service.IWxUserMemberService;
import com.flossom.miniProgram.utils.MiniProgramUtils; import com.flossom.miniProgram.utils.MiniProgramUtils;
import com.flossom.system.api.RemoteAuthService; import com.flossom.system.api.RemoteAuthService;
import com.flossom.system.api.RemoteUserService;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -50,13 +42,15 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
@Override @Override
public LoginUserVo login(String code) throws Exception { public LoginUserVo login(String code) throws Exception {
// 1、使用临时凭证 code 获取 appi + appsecret + unionid // 1、使用临时凭证 code 获取 appi + appsecret + unionid
WxCode2SessionRet wxCode2SessionRet = JSON.parseObject(MiniProgramUtils.getSessionKeyAndOpenId(code), WxCode2SessionRet.class); String result = MiniProgramUtils.getSessionKeyAndOpenId(code);
logger.info("请求微信服务器获取openid和unionid，返回结果：{}", result);
WxCode2SessionRet wxCode2SessionRet = JSON.parseObject(result, WxCode2SessionRet.class);
if (wxCode2SessionRet.getErrcode() != null) { if (wxCode2SessionRet.getErrcode() != null) {
logger.error(wxCode2SessionRet.getErrmsg()); logger.error(wxCode2SessionRet.getErrmsg());
throw new ServiceException("校验失败"); throw new ServiceException("校验失败");
} }
logger.info("openid", wxCode2SessionRet.getOpenid()); logger.info("openid = {}", wxCode2SessionRet.getOpenid());
logger.info("unionid", wxCode2SessionRet.getUnionid()); logger.info("unionid = {}", wxCode2SessionRet.getUnionid());
// 2、根据 openid 查询用户信息 // 2、根据 openid 查询用户信息
WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(wxCode2SessionRet.getOpenid()); WxUserMember wxUserMember = wxUserMemberMapper.selectWxUserMemberByOpenId(wxCode2SessionRet.getOpenid());
@ -68,9 +62,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
wxUserMember.setUnionid(wxCode2SessionRet.getUnionid()); wxUserMember.setUnionid(wxCode2SessionRet.getUnionid());
wxUserMember.setLoginTime(DateUtils.getNowDate()); wxUserMember.setLoginTime(DateUtils.getNowDate());
wxUserMember.setCreateTime(DateUtils.getNowDate()); wxUserMember.setCreateTime(DateUtils.getNowDate());
// 3.2、微信用户表注册 // 2.2、微信用户表注册
wxUserMemberMapper.insertWxUserMember(wxUserMember); wxUserMemberMapper.insertWxUserMember(wxUserMember);
// 3.3、系统表注册 // 2.3、系统表注册
RegisterBody registerBody = new RegisterBody(); RegisterBody registerBody = new RegisterBody();
registerBody.setUsername(wxUserMember.getOpenid()); registerBody.setUsername(wxUserMember.getOpenid());
registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD); registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
@ -87,29 +81,40 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
logger.error("获取token失败：{}", loginResult.getMsg()); logger.error("获取token失败：{}", loginResult.getMsg());
throw new ServiceException(loginResult.getMsg()); throw new ServiceException(loginResult.getMsg());
} }
/** /**
* TODO: 暂时将session_key保存在redis，后期根据业务修改 * TODO: 将 session_key 缓存在 redis，并且由于官方没有规定 session_key 的有效期，所以使用时候要注意如下：
* 当需要使用的时候，需要前端先判断微信的登录态是否过期（wx.checkSession()）
* 1、如果过期，重新调用登录接口获取新的 session_key
* 2、如果没过期，但由于security的拦截器会判断过期时间不足120分钟时会，会对session_key进行续期：{@link com.flossom.common.security.service.TokenService#refreshSessionKey}
*/ */
redisService.setCacheObject(CacheConstants.wx_session_key_cache + wxUserMember.getOpenid(), redisService.setCacheObject(CacheConstants.WX_SESSION_KEY_CACHE + wxUserMember.getOpenid(),
wxCode2SessionRet.getSession_key(), CacheConstants.EXPIRATION, TimeUnit.MINUTES); wxCode2SessionRet.getSession_key(), CacheConstants.EXPIRATION, TimeUnit.MINUTES);
// 4、返回登录信息 // 4、返回登录信息
LoginUserVo loginUserVo = new LoginUserVo(); LoginUserVo loginUserVo = new LoginUserVo();
BeanUtils.copyProperties(wxUserMember, loginUserVo); BeanUtils.copyProperties(wxUserMember, loginUserVo);
loginUserVo.setToken(loginResult.getData().get("access_token")); loginUserVo.setToken(loginResult.getData().get("access_token"));
logger.info("登录用户信息：id = {}, username = {}", loginUserVo.getId(), loginUserVo.getUsername()); logger.info("登录用户信息：id = {}, username = {}, token={}", loginUserVo.getId(), loginUserVo.getUsername(), loginUserVo.getToken());
return loginUserVo; return loginUserVo;
} }
@Override @Override
public void upgradeMember(String code) throws Exception { public String upgradeMember(String code) throws Exception {
WxCode2PhoneRet wxCode2PhoneRet = JSON.parseObject(MiniProgramUtils.getPhone(code), WxCode2PhoneRet.class); String accessToken = MiniProgramUtils.getAccessToken(SecurityUtils.getLoginUser().getWxUserMember().getOpenid());
if (wxCode2PhoneRet.getErrcode() != 200) { if (StringUtils.isBlank(accessToken)) {
logger.error("获取用户手机号码失败: ", wxCode2PhoneRet.getErrmsg()); throw new ServiceException("获取用户手机号码失败");
}
// 获取手机号
String result = MiniProgramUtils.getPhone(code, accessToken);
logger.info("请求微信服务器获取手机号码返回结果：{}", result);
WxCode2PhoneRet wxCode2PhoneRet = JSON.parseObject(result, WxCode2PhoneRet.class);
if (wxCode2PhoneRet.getErrcode() != 0) {
logger.error("获取用户手机号码失败: {}", wxCode2PhoneRet.getErrmsg());
throw new ServiceException("获取用户手机号码失败"); throw new ServiceException("获取用户手机号码失败");
} }
wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue()); wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue());
return wxCode2PhoneRet.getPhoneInfo().getPhoneNumber();
} }
@Override @Override

50
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/MiniProgramUtils.java
Unescape Escape View File

@ -1,13 +1,21 @@
package com.flossom.miniProgram.utils; package com.flossom.miniProgram.utils;
import com.alibaba.fastjson.JSON;
import com.flossom.common.core.constant.CacheConstants;
import com.flossom.common.core.domain.entity.WxParameterSetting; import com.flossom.common.core.domain.entity.WxParameterSetting;
import com.flossom.common.core.mapper.WxParameterSettingMapper; import com.flossom.common.core.mapper.WxParameterSettingMapper;
import com.flossom.common.core.utils.StringUtils;
import com.flossom.common.redis.service.RedisService;
import com.flossom.miniProgram.config.properties.WxConfig; import com.flossom.miniProgram.config.properties.WxConfig;
import com.flossom.miniProgram.domain.vo.WxAccessTokenRet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
/** /**
* 小程序工具类 * 小程序工具类
@ -15,12 +23,17 @@ import java.util.Map;
@Component @Component
public class MiniProgramUtils { public class MiniProgramUtils {
protected final static Logger logger = LoggerFactory.getLogger(MiniProgramUtils.class);
private static WxConfig wxConfig; private static WxConfig wxConfig;
private static WxParameterSettingMapper wxParameterSettingMapper; private static WxParameterSettingMapper wxParameterSettingMapper;
private static RedisService redisService;
/** /**
* 注入 微信配置mapper，获取 appId，appKey（该配置在数据库） * 注入 微信配置mapper，获取 appId，appKey（该配置在数据库）
*
* @param wxParameterSettingMapper * @param wxParameterSettingMapper
*/ */
@Autowired @Autowired
@ -28,8 +41,14 @@ public class MiniProgramUtils {
MiniProgramUtils.wxParameterSettingMapper = wxParameterSettingMapper; MiniProgramUtils.wxParameterSettingMapper = wxParameterSettingMapper;
} }
@Autowired
public void setRedisService(RedisService redisService) {
MiniProgramUtils.redisService = redisService;
}
/** /**
* 注入 微信配置类，读取请求路径（该配置在 nacos） * 注入 微信配置类，读取请求路径（该配置在 nacos）
*
* @param wxConfig * @param wxConfig
*/ */
@Autowired @Autowired
@ -85,11 +104,38 @@ public class MiniProgramUtils {
* purePhoneNumber string 没有区号的手机号 * purePhoneNumber string 没有区号的手机号
* countryCode string 区号 * countryCode string 区号
*/ */
public static String getPhone(String code) throws Exception { public static String getPhone(String code, String accessToken) throws Exception {
Map<String, String> params = new HashMap(); Map<String, String> params = new HashMap();
params.put("code", code); params.put("code", code);
return HttpClientUtils.postParameters(wxConfig.getObtainPhoneUrl(), params); return HttpClientUtils.postParameters(wxConfig.getObtainPhoneUrl() + "?access_token=" + accessToken, JSON.toJSONString(params));
} }
public static String getAccessToken(String openid) throws Exception {
/**
* TODO: 将 access_token 保存在 redis，官方定义说 access_token 的有效期暂定为 2个小时，使用注意事项：
* 1、从 redis 获取 access_token，存在则未过期，不存在则过期了，重新获取 access_token
*/
String accessToken = redisService.getCacheObject(CacheConstants.WX_ACCESS_TOKEN_CACHE + openid);
if (StringUtils.isBlank(accessToken)) {
// 获取 access_token
Map<String, String> params = new HashMap();
WxParameterSetting wxParameterSetting = wxParameterSettingMapper.selectWxParameterSettingById(1L);
params.put("appid", wxParameterSetting.getAppid());
params.put("secret", wxParameterSetting.getAppkey());
params.put("grant_type", "client_credential");
String result = HttpClientUtils.getParameters(wxConfig.getAccessTokenUrl(), params);
logger.info("请求微信服务器获取access_token返回结果：{}", result);
WxAccessTokenRet wxAccessTokenRet = JSON.parseObject(result, WxAccessTokenRet.class);
if (wxAccessTokenRet.getErrcode() != null) {
logger.error("获取 access_token 失败: {}", wxAccessTokenRet.getErrmsg());
return null;
}
// 保存缓存
redisService.setCacheObject(CacheConstants.WX_ACCESS_TOKEN_CACHE + openid,
wxAccessTokenRet.getAccess_token(), CacheConstants.WX_ACCESS_TOKEN_EXPIRATION, TimeUnit.MINUTES);
return wxAccessTokenRet.getAccess_token();
}
return accessToken;
}
} }

26
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserMemberController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.controller;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.utils.poi.ExcelUtil;
import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.controller.BaseController;
import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.common.core.web.domain.AjaxResult;
@ -31,8 +32,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/member") @RequestMapping("/member")
public class WxUserMemberController extends BaseController public class WxUserMemberController extends BaseController {
{
@Autowired @Autowired
private IWxUserMemberService wxUserMemberService; private IWxUserMemberService wxUserMemberService;
@ -41,10 +41,9 @@ public class WxUserMemberController extends BaseController
*/ */
@RequiresPermissions("system:member:list") @RequiresPermissions("system:member:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(WxUserMember wxUserMember) public TableDataInfo list(WxUserMemberVm wxUserMemberVm) {
{
startPage(); startPage();
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMember); List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
return getDataTable(list); return getDataTable(list);
} }
@ -54,8 +53,7 @@ public class WxUserMemberController extends BaseController
@RequiresPermissions("system:member:export") @RequiresPermissions("system:member:export")
@Log(title = "用户", businessType = BusinessType.EXPORT) @Log(title = "用户", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, WxUserMember wxUserMember) public void export(HttpServletResponse response, WxUserMember wxUserMember) {
{
List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMember); List<WxUserMember> list = wxUserMemberService.selectWxUserMemberList(wxUserMember);
ExcelUtil<WxUserMember> util = new ExcelUtil<WxUserMember>(WxUserMember.class); ExcelUtil<WxUserMember> util = new ExcelUtil<WxUserMember>(WxUserMember.class);
util.exportExcel(response, list, "用户数据"); util.exportExcel(response, list, "用户数据");
@ -66,8 +64,7 @@ public class WxUserMemberController extends BaseController
*/ */
@RequiresPermissions("system:member:query") @RequiresPermissions("system:member:query")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id) {
{
return success(wxUserMemberService.selectWxUserMemberById(id)); return success(wxUserMemberService.selectWxUserMemberById(id));
} }
@ -77,8 +74,7 @@ public class WxUserMemberController extends BaseController
@RequiresPermissions("system:member:add") @RequiresPermissions("system:member:add")
@Log(title = "用户", businessType = BusinessType.INSERT) @Log(title = "用户", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody WxUserMember wxUserMember) public AjaxResult add(@RequestBody WxUserMember wxUserMember) {
{
return toAjax(wxUserMemberService.insertWxUserMember(wxUserMember)); return toAjax(wxUserMemberService.insertWxUserMember(wxUserMember));
} }
@ -88,8 +84,7 @@ public class WxUserMemberController extends BaseController
@RequiresPermissions("system:member:edit") @RequiresPermissions("system:member:edit")
@Log(title = "用户", businessType = BusinessType.UPDATE) @Log(title = "用户", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody WxUserMember wxUserMember) public AjaxResult edit(@RequestBody WxUserMember wxUserMember) {
{
return toAjax(wxUserMemberService.updateWxUserMember(wxUserMember)); return toAjax(wxUserMemberService.updateWxUserMember(wxUserMember));
} }
@ -98,9 +93,8 @@ public class WxUserMemberController extends BaseController
*/ */
@RequiresPermissions("system:member:remove") @RequiresPermissions("system:member:remove")
@Log(title = "用户", businessType = BusinessType.DELETE) @Log(title = "用户", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids) {
{
return toAjax(wxUserMemberService.deleteWxUserMemberByIds(ids)); return toAjax(wxUserMemberService.deleteWxUserMemberByIds(ids));
} }
} }

9
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxUserMemberService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.flossom.system.service;
import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import java.util.List; import java.util.List;
@ -29,6 +30,14 @@ public interface IWxUserMemberService
*/ */
public List<WxUserMember> selectWxUserMemberList(WxUserMember wxUserMember); public List<WxUserMember> selectWxUserMemberList(WxUserMember wxUserMember);
/**
* 查询用户列表
*
* @param wxUserMemberVm 用户
* @return 用户集合
*/
public List<WxUserMember> selectWxUserMemberList(WxUserMemberVm wxUserMemberVm);
/** /**
* 新增用户 * 新增用户
* *

13
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.flossom.system.service.impl;
import java.util.List; import java.util.List;
import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.entity.WxUserMember;
import com.flossom.common.core.domain.req.WxUserMemberVm;
import com.flossom.common.core.mapper.WxUserMemberMapper; import com.flossom.common.core.mapper.WxUserMemberMapper;
import com.flossom.common.core.utils.DateUtils; import com.flossom.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +46,18 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService
return wxUserMemberMapper.selectWxUserMemberList(wxUserMember); return wxUserMemberMapper.selectWxUserMemberList(wxUserMember);
} }
/**
* 查询用户列表
*
* @param wxUserMemberVm 用户
* @return 用户
*/
@Override
public List<WxUserMember> selectWxUserMemberList(WxUserMemberVm wxUserMemberVm)
{
return wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm);
}
/** /**
* 新增用户 * 新增用户
* *

2
flossom-ui/package.json
Unescape Escape View File

@ -5,7 +5,7 @@
"author": "花至", "author": "花至",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",

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

@ -1,182 +1,82 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="昵称" prop="nickname"> <el-form-item label="用户类型" prop="userType">
<el-input <el-select v-model="queryParams.userType" @keyup.enter.native="handleQuery">
v-model="queryParams.nickname" <el-option label="全部" value=""></el-option>
placeholder="请输入昵称" <el-option label="会员" value="0"></el-option>
clearable <el-option label="游客" value="1"></el-option>
@keyup.enter.native="handleQuery" </el-select>
/>
</el-form-item> </el-form-item>
<el-form-item label="头像" prop="headimg"> <el-form-item label="会员昵称" prop="nickname">
<el-input <el-input
v-model="queryParams.headimg" v-model="queryParams.nickname"
placeholder="请输入头像" placeholder="请输入单个会员昵称进行搜索"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="姓名" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="积分" prop="credit">
<el-input
v-model="queryParams.credit"
placeholder="请输入积分"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="openid" prop="openid">
<el-input
v-model="queryParams.openid"
placeholder="请输入openid"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="unionid" prop="unionid">
<el-input
v-model="queryParams.unionid"
placeholder="请输入unionid"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会员等级：0 不是会员，1以上为会员" prop="level">
<el-input
v-model="queryParams.level"
placeholder="请输入会员等级：0 不是会员，1以上为会员"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="手机" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input <el-input
v-model="queryParams.mobile" v-model="queryParams.mobile"
placeholder="请输入手机" placeholder="搜索多个请用英文逗号隔开"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <el-form-item label="用户编号" prop="id">
<el-input <el-input
v-model="queryParams.password" v-model="queryParams.id"
placeholder="请输入密码" placeholder="搜索多个请用英文逗号隔开"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="个人二维码" prop="userQr">
<el-input
v-model="queryParams.userQr"
placeholder="请输入个人二维码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="省" prop="province">
<el-input
v-model="queryParams.province"
placeholder="请输入省"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入市"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="区" prop="area">
<el-input
v-model="queryParams.area"
placeholder="请输入区"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生日" prop="birthday"> <el-form-item label="生日" prop="birthday">
<el-date-picker clearable <el-date-picker
v-model="queryParams.birthday" clearable
type="date" v-model="queryParams.birthday"
value-format="yyyy-MM-dd" type="date"
placeholder="请选择生日"> value-format="yyyy-MM-dd"
placeholder="请选择生日">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="1可以2不可以" prop="clock"> <el-form-item label="省" prop="provinceId">
<el-input <el-select v-model="queryParams.provinceId" @keyup.enter.native="handleQuery">
v-model="queryParams.clock" <el-option label="广东省" value="19"></el-option>
placeholder="请输入1可以2不可以" <el-option label="湖南省" value="18"></el-option>
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="1可以2不可以" prop="activity"> <el-form-item label="市" prop="cityId">
<el-input <el-select v-model="queryParams.cityId" @keyup.enter.native="handleQuery">
v-model="queryParams.activity" <el-option label="广州市" value="234"></el-option>
placeholder="请输入1可以2不可以" <el-option label="珠海市" value="237"></el-option>
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="微信号" prop="wechat"> <el-form-item label="区" prop="areaId">
<el-input <el-select v-model="queryParams.areaId" @keyup.enter.native="handleQuery">
v-model="queryParams.wechat" <el-option label="天河区" value="2314"></el-option>
placeholder="请输入微信号" <el-option label="黄埔区" value="2317"></el-option>
clearable </el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="应该是邀请码来的" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入应该是邀请码来的"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="1 未对接到中控 2已经对接 3对接失败" prop="isAbutment"> <el-form-item label="用户注册时间" prop="createTime">
<el-input <el-date-picker
v-model="queryParams.isAbutment" v-model="queryParams.createTime"
placeholder="请输入1 未对接到中控 2已经对接 3对接失败" type="datetimerange"
clearable range-separator="至"
@keyup.enter.native="handleQuery" start-placeholder="开始日期"
/> end-placeholder="结束日期"
</el-form-item> align="right">
<el-form-item label="${comment}" prop="collagenDay"> </el-date-picker>
<el-input
v-model="queryParams.collagenDay"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="collagenMount"> <el-form-item label="积分范围" prop="credit">
<el-input <el-input
v-model="queryParams.collagenMount" v-model="queryParams.credit"
placeholder="请输入${comment}" placeholder="请输入积分"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="登陆时间" prop="loginTime">
<el-date-picker clearable
v-model="queryParams.loginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择登陆时间">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -231,40 +131,26 @@
<el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="memberList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="昵称" align="center" prop="nickname" />
<el-table-column label="头像" align="center" prop="headimg" /> <el-table-column label="头像" align="center" prop="headimg" />
<el-table-column label="姓名" align="center" prop="username" /> <el-table-column label="会员昵称" align="center" prop="nickname" />
<el-table-column label="积分" align="center" prop="credit" /> <el-table-column label="用户编号" align="center" prop="id" />
<el-table-column label="openid" align="center" prop="openid" /> <el-table-column label="手机号码" align="center" prop="mobile" />
<el-table-column label="${comment}" align="center" prop="unionid" /> <el-table-column label="生日" align="center" prop="birthday" />
<el-table-column label="用户类型：1游客 2会员" align="center" prop="userType" />
<el-table-column label="会员等级：0 不是会员，1以上为会员" align="center" prop="level" />
<el-table-column label="手机" align="center" prop="mobile" />
<el-table-column label="密码" align="center" prop="password" />
<el-table-column label="个人二维码" align="center" prop="userQr" />
<el-table-column label="省" align="center" prop="province" /> <el-table-column label="省" align="center" prop="province" />
<el-table-column label="市" align="center" prop="city" /> <el-table-column label="市" align="center" prop="city" />
<el-table-column label="区" align="center" prop="area" /> <el-table-column label="区" align="center" prop="area" />
<el-table-column label="生日" align="center" prop="birthday" width="180"> <el-table-column label="信息完善" align="center" prop="isCompleteInformation" />
<template slot-scope="scope"> <el-table-column label="用户注册时间" align="center" prop="createTime" />
<span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span> <el-table-column label="仪器数量" align="center" prop="devicesNum" />
</template> <el-table-column label="小程序标签" align="center" prop="" />
</el-table-column> <el-table-column label="企微标签" align="center" prop="" />
<el-table-column label="1可以2不可以" align="center" prop="clock" /> <el-table-column label="是否对接" align="center" prop="is_abutment" />
<el-table-column label="1可以2不可以" align="center" prop="activity" /> <el-table-column label="积分" align="center" prop="credit" />
<el-table-column label="微信号" align="center" prop="wechat" /> <el-table-column label="即将过期积分" align="center" prop="" />
<el-table-column label="应该是邀请码来的" align="center" prop="code" /> <el-table-column label="用户类型" align="center" prop="userType" />
<el-table-column label="1 未对接到中控 2已经对接 3对接失败" align="center" prop="isAbutment" /> <el-table-column label="unionid" align="center" prop="unionid" />
<el-table-column label="${comment}" align="center" prop="collagenDay" /> <el-table-column label="用户权限" align="center" prop="" />
<el-table-column label="${comment}" align="center" prop="collagenMount" /> <el-table-column label="消息列表" align="center" prop="" />
<el-table-column label="登陆时间" align="center" prop="loginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="${comment}" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -281,6 +167,33 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:member:remove']" v-hasPermi="['system:member:remove']"
>删除</el-button> >删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:member:edit']"
>查看</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
>开启打卡</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
>开启活动</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
>个人信息同步</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
>积分同步</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -311,21 +224,25 @@
<el-form-item label="openid" prop="openid"> <el-form-item label="openid" prop="openid">
<el-input v-model="form.openid" placeholder="请输入openid" /> <el-input v-model="form.openid" placeholder="请输入openid" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="unionid"> <el-form-item label="unionid" prop="unionid">
<el-input v-model="form.unionid" placeholder="请输入${comment}" /> <el-input v-model="form.unionid" placeholder="请输入unionid" />
</el-form-item> </el-form-item>
<el-form-item label="会员等级：0 不是会员，1以上为会员" prop="level"> <el-form-item label="用户类型" prop="userType">
<el-input v-model="form.level" placeholder="请输入会员等级：0 不是会员，1以上为会员" /> <el-radio v-model="form.userType" label="0">游客</el-radio>
<el-radio v-model="form.userType" label="1">会员</el-radio>
</el-form-item>
<el-form-item label="会员等级" prop="level">
<el-input-number v-model="form.level" :min="1" :max="100" label="会员等级"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="手机" prop="mobile"> <el-form-item label="手机" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机" /> <el-input v-model="form.mobile" placeholder="请输入手机" />
</el-form-item> </el-form-item>
<el-form-item label="密码" prop="password"> <!-- <el-form-item label="密码" prop="password">-->
<el-input v-model="form.password" placeholder="请输入密码" /> <!-- <el-input v-model="form.password" placeholder="请输入密码" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="个人二维码" prop="userQr"> <!-- <el-form-item label="个人二维码" prop="userQr">-->
<el-input v-model="form.userQr" placeholder="请输入个人二维码" /> <!-- <el-input v-model="form.userQr" placeholder="请输入个人二维码" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="省" prop="province"> <el-form-item label="省" prop="province">
<el-input v-model="form.province" placeholder="请输入省" /> <el-input v-model="form.province" placeholder="请输入省" />
</el-form-item> </el-form-item>
@ -343,37 +260,20 @@
placeholder="请选择生日"> placeholder="请选择生日">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="1可以2不可以" prop="clock"> <el-form-item label="参与打卡" prop="clock">
<el-input v-model="form.clock" placeholder="请输入1可以2不可以" /> <el-input v-model="form.clock" placeholder="请输入1可以2不可以" />
</el-form-item> </el-form-item>
<el-form-item label="1可以2不可以" prop="activity"> <el-form-item label="参与活动" prop="activity">
<el-input v-model="form.activity" placeholder="请输入1可以2不可以" /> <el-input v-model="form.activity" placeholder="请输入1可以2不可以" />
</el-form-item> </el-form-item>
<el-form-item label="微信号" prop="wechat"> <el-form-item label="微信号" prop="wechat">
<el-input v-model="form.wechat" placeholder="请输入微信号" /> <el-input v-model="form.wechat" placeholder="请输入微信号" />
</el-form-item> </el-form-item>
<el-form-item label="应该是邀请码来的" prop="code">
<el-input v-model="form.code" placeholder="请输入应该是邀请码来的" />
</el-form-item>
<el-form-item label="1 未对接到中控 2已经对接 3对接失败" prop="isAbutment"> <el-form-item label="1 未对接到中控 2已经对接 3对接失败" prop="isAbutment">
<el-input v-model="form.isAbutment" placeholder="请输入1 未对接到中控 2已经对接 3对接失败" /> <el-input v-model="form.isAbutment" placeholder="请输入1 未对接到中控 2已经对接 3对接失败" />
</el-form-item> </el-form-item>
<el-form-item label="${comment}" prop="collagenDay"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.collagenDay" placeholder="请输入${comment}" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="${comment}" prop="collagenMount">
<el-input v-model="form.collagenMount" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="登陆时间" prop="loginTime">
<el-date-picker clearable
v-model="form.loginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择登陆时间">
</el-date-picker>
</el-form-item>
<el-form-item label="${comment}" prop="remark">
<el-input v-model="form.remark" placeholder="请输入${comment}" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -424,8 +324,11 @@ export default {
mobile: null, mobile: null,
password: null, password: null,
userQr: null, userQr: null,
provinceId: null,
province: null, province: null,
cityId: null,
city: null, city: null,
areaId: null,
area: null, area: null,
birthday: null, birthday: null,
clock: null, clock: null,
@ -437,6 +340,7 @@ export default {
collagenMount: null, collagenMount: null,
loginTime: null, loginTime: null,
status: null, status: null,
createTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},

Write Preview
Loading…
Cancel
Save