Skip to content

C
cloud-platform
Commit 979b7b68 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master-Member-bug-modify' into dev 

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
parents 69dbbab7 0e7bf624
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 244 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ 979b7b68
...@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
private AppUserLoginMapper appUserLoginMapper; private AppUserLoginMapper appUserLoginMapper;
@Autowired @Autowired
private BaseUserMemberMapper baseUserMemberMapper; private AppUserDetailBiz appUserDetailBiz;
@Autowired @Autowired
private VehicleFeign vehicleFeign; private VehicleFeign vehicleFeign;
...@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
*/ */
public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) { public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit()); PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO); List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos); PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
if (pageInfo.getList()==null||pageInfo.getList().size()==0) { if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
return pageInfo; return pageInfo;
...@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
Long cityCode = Long.valueOf(appUserManageVo.getCityCode()); Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
String crtyName = map.get(cityCode); String crtyName = map.get(cityCode);
appUserManageVo.setCityName(crtyName); appUserManageVo.setCityName(crtyName);
} }
} }
...@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
*/ */
public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) { public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) {
PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit()); PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO); List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
if (CollectionUtils.isEmpty(appUserManageVos)) { if (CollectionUtils.isEmpty(appUserManageVos)) {
return new PageInfo<AppUserManageVo>(); return new PageInfo<AppUserManageVo>();
} }
// Set<Integer> usSet = appUserManageDTO.getCitySet();
// List<AppUserManageVo> results = appUserManageVos.parallelStream().filter(us -> usSet.contains(us.getCityCode())).collect(Collectors.toList());
PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos); PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
return getAppUserManageVoPageInfo(pageInfo); return getAppUserManageVoPageInfo(pageInfo);
} }
...@@ -186,9 +185,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail ...@@ -186,9 +185,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
public AppUserManageVo findUserInfoById(Integer userId) { public AppUserManageVo findUserInfoById(Integer userId) {
AppUserManageVo appUserManageVo = new AppUserManageVo(); AppUserManageVo appUserManageVo = new AppUserManageVo();
AppUserManageDTO appUserManageDTO = new AppUserManageDTO(); List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(userId);
appUserManageDTO.setUserId(userId);
List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
if (CollectionUtils.isEmpty(appUserManageVos)){ if (CollectionUtils.isEmpty(appUserManageVos)){
return appUserManageVo; return appUserManageVo;
} }
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java
View file @ 979b7b68
...@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper; ...@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper;
import com.github.wxiaoqi.security.admin.bo.UserBo; import com.github.wxiaoqi.security.admin.bo.UserBo;
import com.github.wxiaoqi.security.admin.entity.AppUserLogin; import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
import com.github.wxiaoqi.security.admin.entity.AppUserManage; import com.github.wxiaoqi.security.admin.entity.AppUserManage;
import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
...@@ -36,4 +37,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList ...@@ -36,4 +37,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
List<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds); List<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds);
List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids); List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids);
AppUserManageVo selectByParentId(@Param("parentId") Integer parentId);
} }
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ 979b7b68
...@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap ...@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
} }
/** /**
* 查询所有,获取具体信息 * 根据用户id获取用户详情
* @param userId
* @return * @return
*/ */
@PostMapping("/all")
public ObjectRestResponse<PageInfo<AppUserManageVo>> getAllAppUsers(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
String token = userAuthConfig.getToken(request);
ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
User user = (User) objectRestResponse.getData();
if (user==null){
throw new BaseException("User error!");
}
if (ALL_PERMISSIONS.equals(user.getDataAll())) {
return ObjectRestResponse.succ(baseBiz.getAllAppUsers(appUserManageDTO));
}
ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
Set<Integer> cityList = setObjectRestResponse.getData();
appUserManageDTO.setCitySet(cityList);
return ObjectRestResponse.succ(baseBiz.getAllAppUsersAndCity(appUserManageDTO));
}
@GetMapping("/user_info/{id}") @GetMapping("/user_info/{id}")
public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){ public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId); AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
......
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ 979b7b68
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
<!-- 获取用户信息 --> <!-- 获取用户信息 -->
<select id="getUserVo" resultMap="AppUserVoMap"> <select id="getUserVo" resultMap="AppUserVoMap">
select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name as jobTitle,buml.name as memberName from app_user_login l select
l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name as
jobTitle,buml.name as memberName from app_user_login l
left join app_user_detail d left join app_user_detail d
on d.userid = l.id on d.userid = l.id
left join base_user_member bum left join base_user_member bum
...@@ -60,8 +62,7 @@ ...@@ -60,8 +62,7 @@
on d.position_id=p.id on d.position_id=p.id
where where
d.userid in d.userid in
<foreach collection="list" item="userId" index="index" open="(" separator="," close=")">
<foreach collection="list" item="userId" index="index" open="(" separator="," close=")" >
#{userId} #{userId}
</foreach> </foreach>
...@@ -76,224 +77,117 @@ ...@@ -76,224 +77,117 @@
</select> </select>
<select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO" <select id="selectAppUserManage" parameterType="Integer"
resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo"> resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
select SELECT
l.id As userid, l.id AS userid,
l.username, l.username,
l.certification_status as certificationStatus, l.certification_status AS certificationStatus,
l.id_number as idNumber, l.id_number AS idNumber,
l.createtime, l.createtime,
l.last_time as lastTime, l.last_time AS lastTime,
l.status, l. STATUS,
d.channel, d.channel,
d.is_member, d.is_member,
d.realname, d.realname,
d.nickname, d.nickname,
d.source, d.source,
d.province_code as provinceCode, d.province_code AS provinceCode,
d.city_code as cityCode, d.city_code AS cityCode,
d.sex, d.sex,
d.headimgurl, d.headimgurl,
d.email, d.email,
m.member_level as memberLevel, m.valid_time AS validTime,
m.valid_time as validTime, m.buy_count AS buyCount,
m.buy_count as buyCount, m.total_number AS totalNumber,
m.total_number as totalNumber, m.rent_free_days AS rentFreeDays,
m.rent_free_days as rentFreeDays, m.crt_time AS timeOfMembership,
m.crt_time as timeOfMembership, m.recent_recharge AS recentRecharge,
m.recent_recharge as recentRecharge, ml. NAME AS memberName,
m.name as memberName, aup. NAME AS `positionName`,
ul.username as inviter, ul.username AS inviter,
aup.name as `positionName`, IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
p.nameOfSuperior, pl.username AS superiorMobileNumber
p.username AS superiorMobileNumber, FROM
p.parent_id as parentId
from
app_user_login l app_user_login l
inner join LEFT JOIN app_user_detail d ON d.userid = l.id
(select * from app_user_detail where 1=1 LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
<if test="postionState != null"> LEFT JOIN base_user_member m ON d.userid = m.user_id
<choose> LEFT JOIN
<when test="postionState == 6">
and `position_id`=#{postionState}
</when>
<otherwise>
and <![CDATA[`position_id`<>6]]>
</otherwise>
</choose>
</if>
) d
on
d.userid = l.id
left join
app_user_login ul
on
ul.id=d.inviter_account
left join
( (
select
b.*,
ml.name
from
base_user_member b
left join
base_user_member_level ml
on
ml.level = b.member_level
where
ml.isdel=0
) m
on
l.id = m.user_id
left join
`app_user_position` as aup
on aup.id = d.position_id
left join (
SELECT SELECT
r.user_id, LEVEL,
r.parent_id, NAME
l.username,
IFNULL(d.realname,d.nickname) as nameOfSuperior
FROM FROM
app_user_relation r base_user_member_level
LEFT JOIN app_user_login l ON r.parent_id = l.id
LEFT JOIN app_user_detail d ON l.id = d.userid
WHERE WHERE
l.isdel = 0 isdel = 0
AND ) ml ON m.member_level = ml. LEVEL
r.is_del = 0 LEFT JOIN app_user_position aup ON aup.id = d.position_id
) p LEFT JOIN
on (
l.id=p.user_id SELECT
where l.isdel = 0 user_id,
<if test="mobile !=null and mobile !='' "> parent_id
and l.username like CONCAT('%',#{mobile},'%') FROM
</if> app_user_relation
<if test="channel !=null "> WHERE
and d.channel=#{channel} is_del = 0
</if> ) r ON l.id = r.user_id
<if test="memberLevel !=null and memberLevel != -1"> LEFT JOIN app_user_login pl ON r.parent_id = pl.id
and m.member_level = #{memberLevel} LEFT JOIN app_user_detail pd ON pl.id = pd.userid
</if> WHERE
<if test="memberLevel == -1"> l.id = #{userId}
and m.member_level in (select level from base_user_member_level)
</if>
<if test="registrationTimeBegin !=null ">
and l.createtime &gt;= #{registrationTimeBegin}
</if>
<if test="registrationTimeEnd !=null ">
and l.createtime &lt;= #{registrationTimeEnd}
</if>
<if test="source !=null ">
and d.source = #{source}
</if>
<if test="userId!=null">
and l.id=#{userId}
</if>
<if test="realName !=null and realName != ''">
and d.realname like CONCAT('%',#{realName},'%')
</if>
<if test="citySet != null ">
and d.city_code in
<foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by l.id ASC
</select> </select>
<update id="updateUserMemberStatusByUserId"> <update id="updateUserMemberStatusByUserId">
update `app_user_detail` set `is_member`={status} where `userid`=#{userId} update `app_user_detail` set `is_member`={status} where `userid`=#{userId}
</update> </update>
<update id="updateUserPositionByUserId"> <update id="updateUserPositionByUserId">
update `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId} update `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId}
</update> </update>
<select id="selectAppUser" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO" <select id="selectAppUser" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo"> resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
select SELECT
l.id As userid, l.id AS userid,
l.username, l.username,
d.channel, d.channel,
d.is_member,
d.realname,
d.source, d.source,
d.province_code as provinceCode, d.realname,
d.city_code as cityCode, ml. NAME AS memberName,
d.sex, aup. NAME AS positionName,
d.headimgurl, m.crt_time AS timeOfMembership,
d.email, m.total_number AS totalNumber,
m.member_level as memberLevel, m.rent_free_days AS rentFreeDays,
m.valid_time as validTime, IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
m.buy_count as buyCount, pl.username AS superiorMobileNumber
m.total_number as totalNumber, FROM
m.rent_free_days as rentFreeDays,
m.crt_time as timeOfMembership,
m.recent_recharge as recentRecharge,
m.name as memberName,
aup.name as `positionName`,
p.nameOfSuperior,
p.username AS superiorMobileNumber,
p.parent_id as parentId
from
app_user_login l app_user_login l
inner join LEFT JOIN app_user_detail d ON d.userid = l.id
(select * from app_user_detail where 1=1 LEFT JOIN base_user_member m ON d.userid = m.user_id
<if test="postionState != null"> LEFT JOIN (
<choose>
<when test="postionState == 6">
and `position_id`=#{postionState}
</when>
<otherwise>
and <![CDATA[`position_id`<>6]]>
</otherwise>
</choose>
</if>
) d
on
d.userid = l.id
left join
app_user_login ul
on
ul.id=d.inviter_account
left join
(
select
b.*,
ml.name
from
base_user_member b
left join
base_user_member_level ml
on
ml.level = b.member_level
where ml.isdel = 0
) m
on
l.id = m.user_id
left join
`app_user_position` as aup
on aup.id = d.position_id
left join (
SELECT SELECT
r.user_id, LEVEL,
r.parent_id, NAME
l.username, FROM
IFNULL(d.realname,d.nickname) as nameOfSuperior base_user_member_level
WHERE
isdel = 0
) ml ON m.member_level = ml. LEVEL
LEFT JOIN app_user_position aup ON aup.id = d.position_id
LEFT JOIN (
SELECT
user_id,
parent_id
FROM FROM
app_user_relation r app_user_relation
LEFT JOIN app_user_login l ON r.parent_id = l.id WHERE
LEFT JOIN app_user_detail d ON l.id = d.userid is_del = 0
) 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
WHERE WHERE
l.isdel = 0 l.isdel = 0
AND
r.is_del = 0
) p
on
l.id=p.user_id
where l.isdel = 0
<if test="mobile !=null and mobile !='' "> <if test="mobile !=null and mobile !='' ">
and l.username like CONCAT('%',#{mobile},'%') and l.username like CONCAT('%',#{mobile},'%')
</if> </if>
...@@ -319,12 +213,26 @@ ...@@ -319,12 +213,26 @@
<if test="userId!=null"> <if test="userId!=null">
and l.id=#{userId} and l.id=#{userId}
</if> </if>
<if test="postionState != null">
<choose>
<when test="postionState == 6">
and d.position_id =#{postionState}
</when>
<otherwise>
and <![CDATA[d.`position_id`<>6]]>
</otherwise>
</choose>
</if>
<if test="realName !=null and realName != ''">
and d.realname like CONCAT('%',#{realName},'%')
</if>
<if test="citySet != null "> <if test="citySet != null ">
and d.city_code in and d.city_code in
<foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" > <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
order by l.id ASC order by l.id ASC
</select> </select>
</mapper> </mapper>
\ No newline at end of file
ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml
View file @ 979b7b68
...@@ -55,4 +55,9 @@ ...@@ -55,4 +55,9 @@
INNER JOIN INNER JOIN
`app_user_detail` AS `aud` ON aud.userid=aul.id `app_user_detail` AS `aud` ON aud.userid=aul.id
</select> </select>
<select id="selectByParentId" resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
select IFNULL(d.realname, d.nickname) AS nameOfSuperior,l.username AS superiorMobileNumber
from app_user_login l left join app_user_detail d on l.id = d.userid where l.isdel=0 and l.id =#{parentId}
</select>
</mapper> </mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ 979b7b68
...@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
orderPageVO.setMemberName(appUserVo.getMemberName()); orderPageVO.setMemberName(appUserVo.getMemberName());
} }
if (dto.getType() == 1) { if (dto.getType()!= null&&dto.getType() == 1) {
String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail(); String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
try { try {
...@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
log.info("获取驾驶人信息失败！"); log.info("获取驾驶人信息失败！");
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
......
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