用户查询接口
This commit is contained in:
parent
56f04cd938
commit
78206efe42
|
|
@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.dto.UserInviteDTO;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.entity.UserVip;
|
||||
|
|
@ -140,9 +141,9 @@ public class UserController {
|
|||
public Result selectUserList(Integer page, Integer limit, String phone, Integer sex, String platform,
|
||||
String sysPhone, Integer status, Integer member, String inviterCode,
|
||||
String userName, String invitationCode, String startTime, String endTime,
|
||||
String qdCode, String sysUserName, Integer vipType) {
|
||||
String qdCode, String sysUserName, Integer vipType, Integer delegate) {
|
||||
return Result.success().put("data", userService.selectUserPage(page, limit, phone, sex, platform, sysPhone, status, member,
|
||||
inviterCode, userName, invitationCode, startTime, endTime, qdCode, sysUserName, vipType));
|
||||
inviterCode, userName, invitationCode, startTime, endTime, qdCode, sysUserName, vipType, delegate));
|
||||
}
|
||||
|
||||
@GetMapping("/userListExcel")
|
||||
|
|
@ -435,4 +436,19 @@ public class UserController {
|
|||
}
|
||||
|
||||
|
||||
@ApiOperation("更新用户邀请奖励金额")
|
||||
@RequestMapping(value = "/inviteAmount", method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public Result updateUserInviteAmount(@RequestBody UserInviteDTO userInviteDTO) {
|
||||
return userService.updateUserInviteAmount(userInviteDTO);
|
||||
}
|
||||
|
||||
@ApiOperation("更新用户邀请奖励金额")
|
||||
@RequestMapping(value = "/removeUserBlack", method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
public Result removeUserBlack(Long userId) {
|
||||
return userService.removeUserBlack(userId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -229,18 +229,4 @@ public class AppLoginController {
|
|||
return userService.loginByOpenId(openId);
|
||||
}
|
||||
|
||||
@ApiOperation("更新用户邀请奖励金额")
|
||||
@RequestMapping(value = "/inviteAmount", method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
public Result updateUserInviteAmount(@RequestBody UserInviteDTO userInviteDTO) {
|
||||
return userService.updateUserInviteAmount(userInviteDTO);
|
||||
}
|
||||
|
||||
@ApiOperation("更新用户邀请奖励金额")
|
||||
@RequestMapping(value = "/removeUserBlack", method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
public Result removeUserBlack(Long userId) {
|
||||
return userService.removeUserBlack(userId);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,9 @@ public interface UserDao extends BaseMapper<UserEntity> {
|
|||
@Param("sysPhone") String sysPhone, @Param("status") Integer status, @Param("member") Integer member,
|
||||
@Param("inviterCode") String inviterCode, @Param("userName") String userName,
|
||||
@Param("invitationCode") String invitationCode, @Param("startTime") String startTime,
|
||||
@Param("endTime") String endTime,@Param("qdCode") String qdCode,@Param("sysUserName") String sysUserName,Integer vipType);
|
||||
@Param("endTime") String endTime,@Param("qdCode") String qdCode,
|
||||
@Param("sysUserName") String sysUserName, @Param("vipType") Integer vipType,
|
||||
@Param("delegate") Integer delegate);
|
||||
|
||||
List<UserEntity> userListExcel(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userEntity") UserEntity userEntity);
|
||||
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ public interface UserService extends IService<UserEntity> {
|
|||
|
||||
PageUtils selectUserPage(Integer page, Integer limit,String phone,Integer sex,String platform,String sysPhone,Integer status,
|
||||
Integer member, String inviterCode, String userName, String invitationCode, String startTime,
|
||||
String endTime,String qdCode,String sysUserName,Integer vipType);
|
||||
String endTime,String qdCode,String sysUserName,Integer vipType, Integer delegate);
|
||||
|
||||
List<UserEntity> userListExcel(String startTime, String endTime, UserEntity userEntity);
|
||||
|
||||
|
|
|
|||
|
|
@ -1448,7 +1448,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||
@Override
|
||||
public PageUtils selectUserPage(Integer page, Integer limit, String search, Integer sex, String platform,
|
||||
String sysPhone, Integer status, Integer member, String inviterCode, String userName,
|
||||
String invitationCode, String startTime, String endTime, String qdCode, String sysUserName, Integer vipType) {
|
||||
String invitationCode, String startTime, String endTime, String qdCode, String sysUserName
|
||||
, Integer vipType, Integer delegate) {
|
||||
PageHelper.startPage(page, limit);
|
||||
List<UserEntity> entities = baseMapper.selectUserPage(search, sex, platform, sysPhone, status, member,
|
||||
inviterCode, userName, invitationCode, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), qdCode, sysUserName, vipType);
|
||||
|
|
|
|||
|
|
@ -50,6 +50,12 @@
|
|||
<if test="endTime!=null and endTime!='' and (startTime==null or startTime=='')">
|
||||
and u.create_time <= #{endTime}
|
||||
</if>
|
||||
<if test="delegate!=null and delegate==0 ">
|
||||
and u.invite_count = 0
|
||||
</if>
|
||||
<if test="delegate!=null and delegate==1 ">
|
||||
and u.invite_count > 0
|
||||
</if>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue