Skip to content

C
cloud-platform
Commit 805e4000 authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

parents 52d39129 71927300
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 124 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @ 805e4000
......@@ -75,6 +75,15 @@ public class AppUserManageDTO {
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 @ 805e4000
package com.github.wxiaoqi.security.admin.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
......@@ -12,6 +14,8 @@ import javax.persistence.Table;
* 用户详情信息表
*/
@Table(name = "app_user_detail")
@AllArgsConstructor
@NoArgsConstructor
@Data
public class AppUserDetail {
@Id
......@@ -79,11 +83,13 @@ public class AppUserDetail {
@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;
@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 @ 805e4000
......@@ -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 @ 805e4000
......@@ -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 @ 805e4000
......@@ -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 @ 805e4000
......@@ -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 @ 805e4000
......@@ -71,4 +71,12 @@ public class AppVersionMark implements Serializable {
@ApiModelProperty(value = "版本标识更新时间", hidden = true)
private Long updTime;
/**
* 版本标识来源类型
*/
@Column(name = "source_type")
@ApiModelProperty(value = "版本标识更新时间", hidden = true)
private String sourceType;
}
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/dto/AppVersionMarkDTO.java
View file @ 805e4000
......@@ -40,4 +40,7 @@ public class AppVersionMarkDTO {
@ApiModelProperty(value = "操作标识 1:新增 2：修改 3：删除")
private int changeMark;
@ApiModelProperty(value = "版本标识更新时间")
private String sourceType;
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionMarkBiz.java
View file @ 805e4000
......@@ -8,6 +8,7 @@ import com.xxfc.platform.app.entity.AppVersionMark;
import com.xxfc.platform.app.entity.dto.AppVersionMarkDTO;
import com.xxfc.platform.app.mapper.AppVersionMarkMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
......@@ -15,7 +16,9 @@ import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@Slf4j
......@@ -30,6 +33,10 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
private static final int CHANGE_DELETE_APP_MARK = 2;
private static final int NO_RANDOM_REAPPEAR = 50;
public static final int IS_DEL_IOS_OR_ANDROID = 1;
public static final int SUCCESSFUL_OPERATION_CODE = 1;
public static final int FAIL_OPERATION_CODE = 2;
public static final String SUCCESSFUL_OPERATION = "操作成功";
public static final String FAIL_OPERATION = "安卓/苹果不可删除";
/**
* @Description: 新增APP版本标识
......@@ -38,12 +45,20 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
* @Author: zyh
* @Date: 2020/1/10
*/
public ObjectRestResponse addAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
if (StringUtils.isBlank(appVersionMarkDTO.getMarkName()) || StringUtils.isBlank(appVersionMarkDTO.getMarkRemark())) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
public Map<Integer, String> addAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
Map<Integer, String> statusMap = new HashMap<>();
if (StringUtils.isBlank(appVersionMarkDTO.getMarkName()) || StringUtils.isBlank(appVersionMarkDTO.getMarkRemark())
|| StringUtils.isBlank(appVersionMarkDTO.getSourceType()) || StringUtils.isBlank(appVersionMarkDTO.getMark())) {
statusMap.put(FAIL_OPERATION_CODE, "参数不能为空");
return statusMap;
}
AppVersionMark appVersionMark = new AppVersionMark();
appVersionMark.setMark(getMark());
String markNoBlank = appVersionMarkDTO.getMark().replaceAll(" ", "");
int count = mapper.queryIsMark(markNoBlank);
if (count == 1) {
statusMap.put(FAIL_OPERATION_CODE, "标识已存在");
return statusMap;
}
try {
Date date = new Date();
//设置日期格式
......@@ -54,14 +69,18 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
} catch (ParseException e) {
e.printStackTrace();
}
appVersionMark.setMark(markNoBlank);
appVersionMark.setSourceType(appVersionMarkDTO.getSourceType());
appVersionMark.setMarkName(appVersionMarkDTO.getMarkName());
appVersionMark.setMarkRemark(appVersionMarkDTO.getMarkRemark());
appVersionMark.setIsDel(0);
// insertSelective(appVersionMark);
mapper.insert(appVersionMark);
return ObjectRestResponse.succ();
statusMap.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
return statusMap;
}
/**
* @Description: 随机产生，判断数据库是否已经存在
* @return: 标识
......@@ -110,7 +129,8 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
* @Author: zyh
* @Date: 2020/1/10
*/
public ObjectRestResponse updAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
public Map<Integer, String> updAppVersionMark(AppVersionMarkDTO appVersionMarkDTO) {
Map<Integer, String> status = new HashedMap();
AppVersionMark appVersionMark = new AppVersionMark();
BeanUtils.copyProperties(appVersionMarkDTO, appVersionMark);
if (appVersionMarkDTO.getChangeMark() == CHANGE_UPD_APP_MARK) {
......@@ -118,12 +138,14 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
} else if (appVersionMarkDTO.getChangeMark() == CHANGE_DELETE_APP_MARK) {
Integer count = mapper.findIosOrAndroidVersionAppMark(appVersionMarkDTO.getId());
if (count.equals(IS_DEL_IOS_OR_ANDROID)) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "安卓/IOS不可删除，请重新选择");
status.put(FAIL_OPERATION_CODE, FAIL_OPERATION);
return status;
}
appVersionMark.setIsDel(APP_MARK_IS_DEL);
updateSelectiveById(appVersionMark);
}
return ObjectRestResponse.succ();
status.put(SUCCESSFUL_OPERATION_CODE, SUCCESSFUL_OPERATION);
return status;
}
/**
......@@ -138,17 +160,18 @@ 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: 会员页面查询注册来源 下拉框接口
* @Param:
* @return: list（mark名称）
* @Author: zyh
* @Date: 2020/1/13
*/
public List<AppVersionMarkDTO> findListVersionAppMark() {
List list = mapper.findListVersionAppMark();
return list;
}
}
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/AppVersionMarkMapper.java
View file @ 805e4000
......@@ -15,6 +15,7 @@ import java.util.List;
*/
public interface AppVersionMarkMapper extends Mapper<AppVersionMark> {
int queryIsMark(@Param("mark") String mark);
int queryIsMarkNew(@Param("mark") String mark);
void updAppVersionMark(@Param("markName") String markName,
@Param("markRemark") String markRemark,
......@@ -27,4 +28,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 @ 805e4000
......@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.app.biz.AppVersionMarkBiz;
import com.xxfc.platform.app.entity.AppVersionMark;
import com.xxfc.platform.app.entity.dto.AppVersionMarkDTO;
......@@ -16,7 +17,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import tk.mybatis.mapper.entity.Example;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import static com.xxfc.platform.app.biz.AppVersionMarkBiz.FAIL_OPERATION_CODE;
import static com.xxfc.platform.app.biz.AppVersionMarkBiz.SUCCESSFUL_OPERATION_CODE;
/**
* @program: ace-security
......@@ -43,7 +49,18 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
@CacheClear
public ObjectRestResponse addAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
try {
return ObjectRestResponse.succ(appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO));
Integer status = SUCCESSFUL_OPERATION_CODE;
String message = "";
Map<Integer, String> mapStatus = appVersionMarkBiz.addAppVersionMark(appVersionMarkDTO);
Iterator<Integer> iter = mapStatus.keySet().iterator();
while (iter.hasNext()) {
status = iter.next();
message = mapStatus.get(status);
}
if (status.equals(FAIL_OPERATION_CODE)) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, message);
}
return ObjectRestResponse.succ();
} catch (Exception e) {
log.error("新增失败[{}]", e);
throw new BaseException("新增失败");
......@@ -59,13 +76,26 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
@CacheClear
public ObjectRestResponse updAppVersionMark(@RequestBody AppVersionMarkDTO appVersionMarkDTO) {
try {
return ObjectRestResponse.succ(appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO));
Map<Integer, String> map = appVersionMarkBiz.updAppVersionMark(appVersionMarkDTO);
Iterator<Integer> iter = map.keySet().iterator();
Integer status = 1;
String message = "";
while (iter.hasNext()) {
status = iter.next();
message = map.get(status);
}
if (status.equals(1)) {
return ObjectRestResponse.succ();
} else {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, message);
}
} catch (Exception e) {
log.error("更新失败[{}]", e);
throw new BaseException("更新失败");
}
}
/**
* @Description: 页面展示
* @Param: AppVersionMarkQuery query 业务需求：暂时没有查询框
......@@ -100,10 +130,11 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
return ObjectRestResponse.succ(appVersionMarkBiz.findVersionAppMark(mark));
}
/**
* @Description: app标识列表查询
* @Param: 过滤其他列，返会标识和标识名称
* @return: list
* @Description: 会员页面查询注册来源 下拉框接口
* @Param:
* @return: list（mark名称）
* @Author: zyh
* @Date: 2020/1/13
*/
......@@ -112,4 +143,5 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
return ObjectRestResponse.succ(appVersionMarkBiz.findListVersionAppMark());
}
}
xx-app/xx-app-server/src/main/resources/mapper/AppVersionMarkMapper.xml
View file @ 805e4000
......@@ -16,6 +16,18 @@
</select>
<select id="queryIsMarkNew" parameterType="java.lang.String" resultType="java.lang.Integer">
SELECT
count(*)
FROM
`app_version_mark`
where
is_del=0
<if test="mark!=null and mark!=''">
and binary mark=#{mark}
</if>
</select>
<select id="findVersionAppMark" resultType="com.xxfc.platform.app.entity.AppVersionMark">
select * from
`app_version_mark` a
......@@ -47,4 +59,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