czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

下级佣金不可大于渠道商佣金

Browse Source
This commit is contained in:
wangw
2024-12-17 15:58:49 +08:00
parent 982e79d268
commit 48be3106b8
1 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/main/java/com/sqx/modules/app/controller/UserController.java
View File

@@ -74,7 +74,7 @@ public class UserController {
public Result selectUserByInvitationCode(String invitationCode) { public Result selectUserByInvitationCode(String invitationCode) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
UserEntity userEntity = userService.queryByInvitationCode(invitationCode); UserEntity userEntity = userService.queryByInvitationCode(invitationCode);
Long userId=userEntity.getUserId(); Long userId = userEntity.getUserId();
//查询用户钱包 //查询用户钱包
// Double money = cashOutDao.selectMayMoney(userId); // Double money = cashOutDao.selectMayMoney(userId);
InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId); InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId);
@@ -88,7 +88,7 @@ public class UserController {
//查询邀请人数 //查询邀请人数
int count = userService.queryInviterCount(userEntity.getInvitationCode()); int count = userService.queryInviterCount(userEntity.getInvitationCode());
UserVip userVip = userVipService.selectUserVipByUserId(userId); UserVip userVip = userVipService.selectUserVipByUserId(userId);
if(userVip!=null){ if (userVip != null) {
userEntity.setMember(userVip.getIsVip()); userEntity.setMember(userVip.getIsVip());
userEntity.setEndTime(userVip.getEndTime()); userEntity.setEndTime(userVip.getEndTime());
userEntity.setVipType(userVip.getVipType()); userEntity.setVipType(userVip.getVipType());
@@ -120,7 +120,7 @@ public class UserController {
//查询邀请人数 //查询邀请人数
int count = userService.queryInviterCount(userEntity.getInvitationCode()); int count = userService.queryInviterCount(userEntity.getInvitationCode());
UserVip userVip = userVipService.selectUserVipByUserId(userId); UserVip userVip = userVipService.selectUserVipByUserId(userId);
if(userVip!=null){ if (userVip != null) {
userEntity.setMember(userVip.getIsVip()); userEntity.setMember(userVip.getIsVip());
userEntity.setEndTime(userVip.getEndTime()); userEntity.setEndTime(userVip.getEndTime());
userEntity.setVipType(userVip.getVipType()); userEntity.setVipType(userVip.getVipType());
@@ -136,12 +136,12 @@ public class UserController {
@RequestMapping(value = "/selectUserList", method = RequestMethod.GET) @RequestMapping(value = "/selectUserList", method = RequestMethod.GET)
@ApiOperation("查询所有用户列表") @ApiOperation("查询所有用户列表")
@ResponseBody @ResponseBody
public Result selectUserList(Integer page, Integer limit,String phone,Integer sex,String platform, public Result selectUserList(Integer page, Integer limit, String phone, Integer sex, String platform,
String sysPhone,Integer status, Integer member, String inviterCode, String sysPhone, Integer status, Integer member, String inviterCode,
String userName, String invitationCode, String startTime, String endTime, String userName, String invitationCode, String startTime, String endTime,
String qdCode,String sysUserName,Integer vipType) { String qdCode, String sysUserName, Integer vipType) {
return Result.success().put("data", userService.selectUserPage(page, limit, phone, sex, platform, sysPhone, status, member, 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));
} }
@GetMapping("/userListExcel") @GetMapping("/userListExcel")
@@ -163,17 +163,20 @@ public class UserController {
@ApiOperation("修改用户") @ApiOperation("修改用户")
@ResponseBody @ResponseBody
public Result updateUserByUserId(@RequestBody UserEntity userEntity) { public Result updateUserByUserId(@RequestBody UserEntity userEntity) {
if(StringUtils.isNotEmpty(userEntity.getPhone())){ if (StringUtils.isNotEmpty(userEntity.getPhone())) {
UserEntity phoneUser = userService.queryByPhone(userEntity.getPhone()); UserEntity phoneUser = userService.queryByPhone(userEntity.getPhone());
if(phoneUser!=null && !phoneUser.getUserId().equals(userEntity.getUserId())){ if (phoneUser != null && !phoneUser.getUserId().equals(userEntity.getUserId())) {
return Result.error("手机号已被其他用户绑定！"); return Result.error("手机号已被其他用户绑定！");
} }
} }
if(StringUtils.isNotEmpty(userEntity.getQdCode())){ if (StringUtils.isNotEmpty(userEntity.getQdCode())) {
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("qd_code", userEntity.getQdCode())); SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("qd_code", userEntity.getQdCode()));
if(sysUserEntity==null){ if (sysUserEntity == null) {
return Result.error("渠道码不正确！"); return Result.error("渠道码不正确！");
} }
if (sysUserEntity.getQdRate().compareTo(userEntity.getRate()) < 0 || sysUserEntity.getQdRate().compareTo(userEntity.getTwoRate()) < 0 ) {
return Result.error("下级佣金不可大于渠道商佣金");
}
} }
userService.updateById(userEntity); userService.updateById(userEntity);
return Result.success(); return Result.success();
@@ -224,28 +227,28 @@ public class UserController {
@GetMapping("/homeMessage") @GetMapping("/homeMessage")
@ApiOperation("信息分析") @ApiOperation("信息分析")
public Result homeMessage(Long sysUserId) { public Result homeMessage(Long sysUserId) {
String qdCode=null; String qdCode = null;
if(sysUserId!=null){ if (sysUserId != null) {
qdCode=sysUserService.getById(sysUserId).getQdCode(); qdCode = sysUserService.getById(sysUserId).getQdCode();
} }
HomeMessageResponse homeMessageResponse = new HomeMessageResponse(); HomeMessageResponse homeMessageResponse = new HomeMessageResponse();
// 0查总 1查天 2查月 3查年 // 0查总 1查天 2查月 3查年
//设置总用户人数 //设置总用户人数
homeMessageResponse.setTotalUsers(userService.queryUserCount(0, null,null,qdCode)); homeMessageResponse.setTotalUsers(userService.queryUserCount(0, null, null, qdCode));
//设置今日新增 //设置今日新增
homeMessageResponse.setNewToday(userService.queryUserCount(1, null,null,qdCode)); homeMessageResponse.setNewToday(userService.queryUserCount(1, null, null, qdCode));
//设置本月新增 //设置本月新增
homeMessageResponse.setNewMonth(userService.queryUserCount(2, null,null,qdCode)); homeMessageResponse.setNewMonth(userService.queryUserCount(2, null, null, qdCode));
//设置本年新增 //设置本年新增
homeMessageResponse.setNewYear(userService.queryUserCount(3, null,null,qdCode)); homeMessageResponse.setNewYear(userService.queryUserCount(3, null, null, qdCode));
//设置总收入 //设置总收入
homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0,qdCode)); homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0, qdCode));
//设置今日收入 //设置今日收入
homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1,qdCode)); homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1, qdCode));
//设置本月收入 //设置本月收入
homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2,qdCode)); homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2, qdCode));
//设置本年收入 //设置本年收入
homeMessageResponse.setYearRevenue(userService.queryPayMoney(3,qdCode)); homeMessageResponse.setYearRevenue(userService.queryPayMoney(3, qdCode));
//查询指定日期下的短剧购买的 量 //查询指定日期下的短剧购买的 量
return Result.success().put("data", homeMessageResponse); return Result.success().put("data", homeMessageResponse);
} }
@@ -257,9 +260,9 @@ public class UserController {
*/ */
@GetMapping("/courseMessage") @GetMapping("/courseMessage")
@ApiOperation("短剧分析") @ApiOperation("短剧分析")
public Result courseMessage(Long page, Long limit, String date, int type,Long sysUserId) { public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) {
Page<Map<String, Object>> iPage = new Page<>(page, limit); Page<Map<String, Object>> iPage = new Page<>(page, limit);
IPage<Map<String, Object>> mapIPage = userService.queryCourseOrder(iPage, type, date,sysUserId); IPage<Map<String, Object>> mapIPage = userService.queryCourseOrder(iPage, type, date, sysUserId);
return Result.success().put("data", new PageUtils(mapIPage)); return Result.success().put("data", new PageUtils(mapIPage));
} }
@@ -268,30 +271,30 @@ public class UserController {
*/ */
@GetMapping("/userMessage") @GetMapping("/userMessage")
@ApiOperation("用户分析") @ApiOperation("用户分析")
public Result userMessage(String date, int type,Long sysUserId) { public Result userMessage(String date, int type, Long sysUserId) {
String qdCode=null; String qdCode = null;
if(sysUserId!=null){ if (sysUserId != null) {
qdCode=sysUserService.getById(sysUserId).getQdCode(); qdCode = sysUserService.getById(sysUserId).getQdCode();
} }
int sumUserCount = userService.queryUserCount(type, date,null,qdCode); int sumUserCount = userService.queryUserCount(type, date, null, qdCode);
int h5Count = userService.queryUserCount(type, date,"h5",qdCode); int h5Count = userService.queryUserCount(type, date, "h5", qdCode);
int appCount = userService.queryUserCount(type, date,"app",qdCode); int appCount = userService.queryUserCount(type, date, "app", qdCode);
int wxCount = userService.queryUserCount(type, date,"小程序",qdCode); int wxCount = userService.queryUserCount(type, date, "小程序", qdCode);
int dyCount = userService.queryUserCount(type, date,"抖音",qdCode); int dyCount = userService.queryUserCount(type, date, "抖音", qdCode);
int giveMemberCount = userService.userMessage(date, type,qdCode,1); int giveMemberCount = userService.userMessage(date, type, qdCode, 1);
int moneyMemberCount = userService.userMessage(date, type,qdCode,2); int moneyMemberCount = userService.userMessage(date, type, qdCode, 2);
int memberCount = userService.userMessage(date, type,qdCode,null); int memberCount = userService.userMessage(date, type, qdCode, null);
int userCount = sumUserCount-memberCount; int userCount = sumUserCount - memberCount;
Map<String,Integer> result=new HashMap<>(); Map<String, Integer> result = new HashMap<>();
result.put("sumUserCount",sumUserCount); result.put("sumUserCount", sumUserCount);
result.put("h5Count",h5Count); result.put("h5Count", h5Count);
result.put("appCount",appCount); result.put("appCount", appCount);
result.put("wxCount",wxCount); result.put("wxCount", wxCount);
result.put("dyCount",dyCount); result.put("dyCount", dyCount);
result.put("memberCount",memberCount); result.put("memberCount", memberCount);
result.put("giveMemberCount",giveMemberCount); result.put("giveMemberCount", giveMemberCount);
result.put("moneyMemberCount",moneyMemberCount); result.put("moneyMemberCount", moneyMemberCount);
result.put("userCount",userCount); result.put("userCount", userCount);
return Result.success().put("data", result); return Result.success().put("data", result);
} }
@@ -313,7 +316,7 @@ public class UserController {
userMoneyDetails.setCreateTime(sdf.format(new Date())); userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2); userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
PayDetails payDetails=new PayDetails(); PayDetails payDetails = new PayDetails();
payDetails.setState(1); payDetails.setState(1);
payDetails.setCreateTime(sdf.format(new Date())); payDetails.setCreateTime(sdf.format(new Date()));
payDetails.setUserId(userId); payDetails.setUserId(userId);
@@ -346,15 +349,15 @@ public class UserController {
@PostMapping("/updateSysUserMoney") @PostMapping("/updateSysUserMoney")
@ApiOperation("修改金币") @ApiOperation("修改金币")
public Result updateSysUserMoney(Long userId, Double money,Integer type) { public Result updateSysUserMoney(Long userId, Double money, Integer type) {
userMoneyService.updateSysMoney(type, userId, money); userMoneyService.updateSysMoney(type, userId, money);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setSysUserId(userId); userMoneyDetails.setSysUserId(userId);
if(type==1){ if (type == 1) {
userMoneyDetails.setTitle("[增加金币]平台增加金币：" + money); userMoneyDetails.setTitle("[增加金币]平台增加金币：" + money);
userMoneyDetails.setContent("[增加金币]平台增加金币：" + money); userMoneyDetails.setContent("[增加金币]平台增加金币：" + money);
}else{ } else {
userMoneyDetails.setTitle("[减少金币]平台减少金币：" + money); userMoneyDetails.setTitle("[减少金币]平台减少金币：" + money);
userMoneyDetails.setContent("[减少金币]平台减少金币：" + money); userMoneyDetails.setContent("[减少金币]平台减少金币：" + money);
} }
@@ -370,27 +373,27 @@ public class UserController {
@GetMapping("/selectInviteUserList") @GetMapping("/selectInviteUserList")
@ApiOperation("邀请用户排行榜") @ApiOperation("邀请用户排行榜")
public Result selectInviteUserList(Integer page,Integer limit,String phone,String userName){ public Result selectInviteUserList(Integer page, Integer limit, String phone, String userName) {
return userService.selectInviteUserList(page, limit, userName, phone); return userService.selectInviteUserList(page, limit, userName, phone);
} }
@GetMapping("/selectUserOnLineCount") @GetMapping("/selectUserOnLineCount")
@ApiOperation("统计当前在线人数") @ApiOperation("统计当前在线人数")
public Result selectUserCount(Long sysUserId){ public Result selectUserCount(Long sysUserId) {
String qdCode=null; String qdCode = null;
if(sysUserId!=null){ if (sysUserId != null) {
qdCode=sysUserService.getById(sysUserId).getQdCode(); qdCode = sysUserService.getById(sysUserId).getQdCode();
} }
return userService.selectUserOnLineCount(qdCode); return userService.selectUserOnLineCount(qdCode);
} }
@GetMapping("/selectUserCountStatisticsByTime") @GetMapping("/selectUserCountStatisticsByTime")
@ApiOperation("用户统计") @ApiOperation("用户统计")
public Result selectUserCountStatisticsByTime(String startTime,String endTime){ public Result selectUserCountStatisticsByTime(String startTime, String endTime) {
List<Integer> userCountList=new ArrayList<>(); List<Integer> userCountList = new ArrayList<>();
List<String> year=new ArrayList<>(); List<String> year = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
Date parse = null; Date parse = null;
try { try {
parse = simpleDateFormat.parse(startTime); parse = simpleDateFormat.parse(startTime);
@@ -398,22 +401,21 @@ public class UserController {
e.printStackTrace(); e.printStackTrace();
} }
calendar.setTime(parse); calendar.setTime(parse);
while (true){ while (true) {
String dateTime = simpleDateFormat.format(calendar.getTime()); String dateTime = simpleDateFormat.format(calendar.getTime());
int i = userService.queryUserCount(1, dateTime,null,null); int i = userService.queryUserCount(1, dateTime, null, null);
userCountList.add(i); userCountList.add(i);
year.add(dateTime); year.add(dateTime);
if(dateTime.equals(endTime)){ if (dateTime.equals(endTime)) {
break; break;
} }
calendar.add(Calendar.DATE,1); calendar.add(Calendar.DATE, 1);
} }
Map<String,Object> result=new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("userCountList",userCountList); result.put("userCountList", userCountList);
result.put("year",year); result.put("year", year);
return Result.success().put("data",result); return Result.success().put("data", result);
} }
} }