Skip to content

C
cloud-platform
Commit ff303f88 authored by zuoyh's avatar zuoyh
Browse files
Options

APP版本标识功能 

增加会员页面可查询标识
parent 0c2173ae
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 168 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @ ff303f88
......@@ -69,10 +69,21 @@ public class AppUserManageDTO {
*/
private Integer userId;
/**
* 真实姓名
*/
private String realName;
/**
* 真实姓名
*/
private String realName;
/**
* 注册来源
*/
private String registerSource;
/**
* 注册来源名称
*/
private String markName;
// /**
// * 接收前台时间范围
// */
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java
View file @ ff303f88
......@@ -18,72 +18,76 @@ import javax.persistence.Table;
@NoArgsConstructor
@Data
public class AppUserDetail {
@Id
@GeneratedValue(generator = "JDBC")
private Integer id;
private Integer userid;
@Column(name = "is_member")
private Integer isMember;
@Column(name = "wx_nickname")
private String wxNickname;
@Column(name = "qq_nickname")
private String qqNickname;
private String nickname;
private String realname;
private String headimgurl;
private String email;
private Integer sex;
private String birthday;
@Column(name = "person_sign")
private String personSign;
private String remark;
private Long createtime;
private Long updatetime;
private Integer isdel;
//渠道来源；1-app；2-小程序
private Integer channel;
/**
* 省份编号
*/
@Column(name = "province_code")
private Integer provinceCode;
@Id
@GeneratedValue(generator = "JDBC")
private Integer id;
private Integer userid;
@Column(name = "is_member")
private Integer isMember;
@Column(name = "wx_nickname")
private String wxNickname;
@Column(name = "qq_nickname")
private String qqNickname;
private String nickname;
private String realname;
private String headimgurl;
private String email;
private Integer sex;
private String birthday;
@Column(name = "person_sign")
private String personSign;
private String remark;
private Long createtime;
private Long updatetime;
private Integer isdel;
//渠道来源；1-app；2-小程序
private Integer channel;
/**
* 省份编号
*/
@Column(name = "province_code")
private Integer provinceCode;
/**
* 市编号
*/
@Column(name = "city_code")
private Integer cityCode;
/**
* 市编号
*/
@Column(name = "city_code")
private Integer cityCode;
/**
* 创建ip
*/
@Column(name = "crt_host")
private String crtHost;
/**
* 更新ip
*/
@Column(name = "upd_host")
private String updHost;
/**
* 创建ip
*/
@Column(name = "crt_host")
private String crtHost;
/**
* 更新ip
*/
@Column(name = "upd_host")
private String updHost;
@ApiModelProperty(value = "用户职位")
@Column(name = "position_id")
private Integer positionId;
@ApiModelProperty(value = "用户职位")
@Column(name = "position_id")
private Integer positionId;
@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
@Column(name = "source")
private Integer source;
@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
@Column(name = "source")
private Integer source;
@ApiModelProperty(value = "邀请码")
@Column(name = "code")
private String code;
@ApiModelProperty(value = "邀请码")
@Column(name = "code")
private String code;
@ApiModelProperty(value = "邀请人账号:")
@Column(name = "inviter_account")
private Integer inviterAccount;
@ApiModelProperty(value = "邀请人账号:")
@Column(name = "inviter_account")
private Integer inviterAccount;
@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活")
@Column(name = "state")
private Integer state;
@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活")
@Column(name = "state")
private Integer state;
@ApiModelProperty(value = "注册来源")
@Column(name = "register_source")
private String registerSource;
}
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java
View file @ ff303f88
......@@ -21,6 +21,12 @@ public class AppUserManageVo {
@Column(name = "channel")
private String channel;
/**
* 注册来源
*/
@Column(name="register_source")
private String registerSource;
/**
* 是否是会员：0-不是；1-会员
*/
......@@ -186,4 +192,10 @@ public class AppUserManageVo {
* 上级手机号
*/
private String superiorMobileNumber;
/**
* 注册来源名称
*/
@Column(name = "mark_name")
private String markName;
}
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java
View file @ ff303f88
......@@ -14,90 +14,95 @@ import lombok.NoArgsConstructor;
public class AppUserVo {
private Integer id;
//用户id
private Integer userid;
//imid
private Integer imUserid;
///账号（手机号）
private String username;
//微信openid
private String wxOpenid;
//微信unionid
private String unionid;
//qq
private String openid;
//状态：0-启用，1-禁用
private Integer status;
//身份证号
private String idNumber;
//实名认证状态:0-未认证，1-已认证
private Integer certificationStatus;
//会员
private Integer isMember;
//昵称
private String nickname;
private String wxNickname;
private String aliPayNickName;
private String qqNickname;
//真实姓名
private String realname;
//头像
private String headimgurl;
//邮箱
private String email;
//性别 0-女，1-男
private Integer sex;
//生日
private String birthday;
//个性签名
private String personSign;
//备注
private String remark;
//渠道来源；1-app；2-小程序
private Integer channel;
/**
* 省份编号
*/
private Integer provinceCode;
/**
* 市编号
*/
private Integer cityCode;
/**
* 创建ip
*/
private String crtHost;
/**
* 更新ip
*/
private String updHost;
@ApiModelProperty(value = "用户职位")
private Integer positionId;
@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
private Integer source;
@ApiModelProperty(value = "邀请码")
private String code;
@ApiModelProperty(value = "邀请人id:")
private Integer inviterAccount;
@ApiModelProperty(value = "1-未激活；2-激活:")
private Integer state;
private Integer id;
//用户id
private Integer userid;
//imid
private Integer imUserid;
///账号（手机号）
private String username;
//微信openid
private String wxOpenid;
//微信unionid
private String unionid;
//qq
private String openid;
//状态：0-启用，1-禁用
private Integer status;
//身份证号
private String idNumber;
//实名认证状态:0-未认证，1-已认证
private Integer certificationStatus;
//会员
private Integer isMember;
//昵称
private String nickname;
private String wxNickname;
private String aliPayNickName;
private String qqNickname;
//真实姓名
private String realname;
//头像
private String headimgurl;
//邮箱
private String email;
//性别 0-女，1-男
private Integer sex;
//生日
private String birthday;
//个性签名
private String personSign;
//备注
private String remark;
//渠道来源；1-app；2-小程序
private Integer channel;
//注册来源
private String registerSource;
//注册来源名称
private String markName;
/**
* 省份编号
*/
private Integer provinceCode;
/**
* 市编号
*/
private Integer cityCode;
/**
* 创建ip
*/
private String crtHost;
/**
* 更新ip
*/
private String updHost;
@ApiModelProperty(value = "用户职位")
private Integer positionId;
@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
private Integer source;
@ApiModelProperty(value = "邀请码")
private String code;
@ApiModelProperty(value = "邀请人id:")
private Integer inviterAccount;
@ApiModelProperty(value = "1-未激活；2-激活:")
private Integer state;
@ApiModelProperty(value = "支付宝授权返回的code")
private String aliCode;
private String aliCode;
@ApiModelProperty(value = "用户职位名称")
private String jobTitle;
@ApiModelProperty(value = "用户职位名称")
private String jobTitle;
@ApiModelProperty(value = "用户会员名称")
private String memberName;
@ApiModelProperty(value = "用户会员名称")
private String memberName;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ ff303f88
......@@ -65,7 +65,7 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
User user = (User) objectRestResponse.getData();
if (user==null){
throw new BaseException("User error!");
}
}
if (ALL_PERMISSIONS.equals(user.getDataAll())) {
return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
}
......
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ ff303f88
......@@ -24,6 +24,8 @@
<result column="person_sign" property="personSign"/>
<result column="remark" property="remark"/>
<result column="channel" property="channel"/>
<result column="register_source" property="registerSource"/>
<result column="mark_name" property="markName"/>
<result column="province_code" property="provinceCode"/>
<result column="city_code" property="cityCode"/>
<result column="crt_host" property="crtHost"/>
......@@ -37,7 +39,6 @@
<result column="memberName" property="memberName"/>
</resultMap>
<!-- 获取用户信息 -->
<select id="getUserInfo" resultMap="AppUserVoMap">
select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.* from app_user_login l
......@@ -87,7 +88,9 @@
l.createtime,
l.last_time AS lastTime,
l. STATUS,
z.mark_name AS markName,
d.channel,
d.register_source,
d.is_member,
d.realname,
d.nickname,
......@@ -113,6 +116,7 @@
LEFT JOIN app_user_detail d ON d.userid = l.id
LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
LEFT JOIN base_user_member m ON d.userid = m.user_id
LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
LEFT JOIN
(
SELECT
......@@ -152,8 +156,10 @@
l.id AS userid,
l.username,
d.channel,
d.register_source,
d.source,
d.realname,
z.mark_name AS markName,
ml. NAME AS memberName,
aup. NAME AS positionName,
m.crt_time AS timeOfMembership,
......@@ -186,6 +192,7 @@
) r ON l.id = r.user_id
LEFT JOIN app_user_login pl ON r.parent_id = pl.id
LEFT JOIN app_user_detail pd ON pl.id = pd.userid
LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
WHERE
l.isdel = 0
<if test="mobile !=null and mobile !='' ">
......@@ -194,6 +201,9 @@
<if test="channel !=null ">
and d.channel=#{channel}
</if>
<if test="registerSource !=null ">
and binary d.register_source=#{registerSource}
</if>
<if test="memberLevel !=null and memberLevel != -1">
and m.member_level = #{memberLevel}
</if>
......@@ -263,23 +273,27 @@ from `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
<select id="findAllStaffsByCompanyIdAndPostionId"
resultType="com.github.wxiaoqi.security.admin.bo.UserStaffBo">
select * from (select aud.userid as `userId`,aud.realname as `realName`,aud.nickname as `nickName`,aul.username as `phone`,aud.position_id
as `postionId`,aup.name as `postionName`,aupt.company_id as `companyId`,aupt.company_name as `companyName` from `app_user_detail` as `aud`
select * from (select aud.userid as `userId`,aud.realname as `realName`,aud.nickname as `nickName`,aul.username
as `phone`,aud.position_id
as `postionId`,aup.name as `postionName`,aupt.company_id as `companyId`,aupt.company_name as `companyName` from
`app_user_detail` as `aud`
left join `app_user_login` as `aul` on aul.id=aud.userid
left join (select * from `app_user_position_temp` where is_del=0) as `aupt` on aupt.user_id=aul.id
left join `app_user_position` as `aup` on aup.id=aud.position_id where <![CDATA[aud.position_id<>6]]> and aud.isdel=0
<if test="userPostionId!=null">
and aud.`position_id`=#{userPostionId}
</if>
left join (select * from `app_user_position_temp` where is_del=0) as `aupt` on aupt.user_id=aul.id
left join `app_user_position` as `aup` on aup.id=aud.position_id where <![CDATA[aud.position_id<>6]]> and
aud.isdel=0
<if test="userPostionId!=null">
and aud.`position_id`=#{userPostionId}
</if>
<if test="companyId!=null">
and aupt.`company_id`=#{companyId}
and aupt.`company_id`=#{companyId}
</if>
<if test="userIds!=null and userIds.size>0">
and aud.userid in
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
#{userId}
</foreach>
</if>) as `saff`
</if>
) as `saff`
left join (
select auswp.user_id, IFNULL(auswp.upIncome, 0) - IFNULL(auswd.dowIncome, 0) as `sellAmount`
from (select `user_id`, sum(commission / (extract/100.0)) as `upIncome`
......@@ -287,7 +301,7 @@ from `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
where <![CDATA[position_id<>6]]>
and status = 0
<if test="startDate!=null and endDate!=null">
and `crt_time` between #{startTime} and #{endTime}
and `crt_time` between #{startTime} and #{endTime}
</if>
<if test="startDate!=null and endDate==null">
and <![CDATA[
......
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/AppVersionMark.java
View file @ ff303f88
......@@ -71,4 +71,5 @@ public class AppVersionMark implements Serializable {
@ApiModelProperty(value = "版本标识更新时间", hidden = true)
private Long updTime;
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionMarkBiz.java
View file @ ff303f88
......@@ -138,17 +138,29 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
return list;
}
/**
* @Description: app标识查询列表
* @Param:
* @return: list
* @Author: zyh
* @Date: 2020/1/13
*/
public List<AppVersionMarkDTO> findListVersionAppMark( ) {
List list = mapper.findListVersionAppMark();
return list;
}
/**
* @Description: app标识查询列表
* @Param:
* @return: list
* @Author: zyh
* @Date: 2020/1/13
*/
public List<AppVersionMarkDTO> findListVersionAppMark() {
List list = mapper.findListVersionAppMark();
return list;
}
/**
* @Description: 会员页面查询注册来源 下拉框接口
* @Param:
* @return: list（mark名称）
* @Author: zyh
* @Date: 2020/1/13
*/
public List<AppVersionMarkDTO> queryListForUserMember() {
List list = mapper.queryListForUserMember();
return list;
}
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/AppVersionMarkMapper.java
View file @ ff303f88
......@@ -27,4 +27,6 @@ public interface AppVersionMarkMapper extends Mapper<AppVersionMark> {
int findIosOrAndroidVersionAppMark(@Param("id") Integer id);
List<AppVersionMark> findListVersionAppMark();
List<AppVersionMark > queryListForUserMember();
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java
View file @ ff303f88
......@@ -112,4 +112,9 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
return ObjectRestResponse.succ(appVersionMarkBiz.findListVersionAppMark());
}
@GetMapping("/query/mark")
public ObjectRestResponse queryListForUserMember() {
return ObjectRestResponse.succ(appVersionMarkBiz.queryListForUserMember());
}
}
xx-app/xx-app-server/src/main/resources/mapper/AppVersionMarkMapper.xml
View file @ ff303f88
......@@ -47,4 +47,12 @@
where
is_del = 0
</select>
<select id="queryListForUserMember" resultType="com.xxfc.platform.app.entity.AppVersionMark">
select `mark_name` as registerSource
from
`app_version_mark` a
where
is_del = 0
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment