流水区分金豆和钱

This commit is contained in:
GYJ
2024-12-11 16:10:24 +08:00
parent 2f73eb9032
commit 211f99c87b
25 changed files with 111 additions and 73 deletions

View File

@@ -159,6 +159,7 @@ public class InviteController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success();
}
@@ -176,9 +177,10 @@ public class InviteController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success();
}
}
}

View File

@@ -66,116 +66,115 @@ public class AppInviteController {
@RequestMapping(value = "/selectInviteCount", method = RequestMethod.GET)
@ApiOperation("查看我邀请的人员数量")
@ResponseBody
public Result selectInviteCount(Integer state,Long userId){
return Result.success().put("data",inviteService.selectInviteCount(state,userId));
public Result selectInviteCount(Integer state, Long userId) {
return Result.success().put("data", inviteService.selectInviteCount(state, userId));
}
@Login
@RequestMapping(value = "/selectUserMoney", method = RequestMethod.GET)
@ApiOperation("查看我的钱包")
@ResponseBody
public Result selectUserMoney(@RequestAttribute("userId") Long userId){
return Result.success().put("data",userMoneyService.selectUserMoneyByUserId(userId));
public Result selectUserMoney(@RequestAttribute("userId") Long userId) {
return Result.success().put("data", userMoneyService.selectUserMoneyByUserId(userId));
}
@RequestMapping(value = "/selectInviteAndPoster", method = RequestMethod.GET)
@ApiOperation("查看我的邀请码和海报二维码")
@ResponseBody
public Result selectInviteAndPoster(Long userId){
public Result selectInviteAndPoster(Long userId) {
UserEntity userEntity = userService.queryByUserId(userId);
CommonInfo one = commonInfoService.findOne(19);
Map<String,Object> map=new HashMap<>();
map.put("url",one.getValue());
map.put("user",userEntity);
return Result.success().put("data",map);
Map<String, Object> map = new HashMap<>();
map.put("url", one.getValue());
map.put("user", userEntity);
return Result.success().put("data", map);
}
@Login
@RequestMapping(value = "/selectInviteMoney", method = RequestMethod.GET)
@ApiOperation("我的收益")
@ResponseBody
public Result selectInviteMoney(@RequestAttribute("userId") Long userId){
public Result selectInviteMoney(@RequestAttribute("userId") Long userId) {
InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId);
Integer inviteCount = inviteService.selectInviteCount(-1, userId);
Integer inviteSignCount = inviteService.selectInviteCount(1, userId);
Map<String,Object> result=new HashMap<>();
result.put("inviteMoney",inviteMoney);
result.put("inviteCount",inviteCount);
result.put("inviteSignCount",inviteSignCount);
return Result.success().put("data",result);
Map<String, Object> result = new HashMap<>();
result.put("inviteMoney", inviteMoney);
result.put("inviteCount", inviteCount);
result.put("inviteSignCount", inviteSignCount);
return Result.success().put("data", result);
}
@GetMapping("/mpCreateQr")
@ApiOperation("微信小程序推广二维码")
public void mpCreateQr(String invitationCode,String page, HttpServletResponse response) {
SenInfoCheckUtil.getPoster(invitationCode,page,response);
public void mpCreateQr(String invitationCode, String page, HttpServletResponse response) {
SenInfoCheckUtil.getPoster(invitationCode, page, response);
}
@GetMapping("/dyCreateQr")
@ApiOperation("抖音小程序推广二维码")
public void dyCreateQr(String invitationCode,String page, HttpServletResponse response) {
SenInfoCheckUtil.getDyImg(invitationCode,page,response);
public void dyCreateQr(String invitationCode, String page, HttpServletResponse response) {
SenInfoCheckUtil.getDyImg(invitationCode, page, response);
}
@GetMapping("/insertQrCode")
@ApiOperation("生成二维码")
public void selectQrCode(String content,String courseId, HttpServletResponse servletResponse) throws Exception{
public void selectQrCode(String content, String courseId, HttpServletResponse servletResponse) throws Exception {
String invitationCode = commonInfoService.findOne(88).getValue();
String value="";
if(StringUtils.isNotBlank(courseId)){
value=urlAddressService.selectUrlAddressOne().getUrlAddress()+"?invitation="+invitationCode+"&qdCode="+content+"&id="+courseId;
}else{
value=urlAddressService.selectUrlAddressOne().getUrlAddress()+"?invitation="+invitationCode+"&qdCode="+content;
String value = "";
if (StringUtils.isNotBlank(courseId)) {
value = urlAddressService.selectUrlAddressOne().getUrlAddress() + "?invitation=" + invitationCode + "&qdCode=" + content + "&id=" + courseId;
} else {
value = urlAddressService.selectUrlAddressOne().getUrlAddress() + "?invitation=" + invitationCode + "&qdCode=" + content;
}
QrCodeUtil.generate(value,qrconig,"png",servletResponse.getOutputStream());
QrCodeUtil.generate(value, qrconig, "png", servletResponse.getOutputStream());
}
@Login
@RequestMapping(value = "/selectInviteByUserIdLists", method = RequestMethod.GET)
@ApiOperation("查看我邀请的人员列表(查看所有邀请列表)")
@ResponseBody
public Result selectInviteByUserIdLists(int page,int limit,@RequestAttribute("userId") Long userId,Integer userType){
PageUtils pageUtils = inviteService.selectInviteUser(page, limit, userId,null,userType);
return Result.success().put("data",pageUtils);
public Result selectInviteByUserIdLists(int page, int limit, @RequestAttribute("userId") Long userId, Integer userType) {
PageUtils pageUtils = inviteService.selectInviteUser(page, limit, userId, null, userType);
return Result.success().put("data", pageUtils);
}
@Login
@ApiOperation("钱包明细")
@GetMapping("/queryUserMoneyDetails")
public Result queryUserMoneyDetails(Integer page, Integer limit,@RequestAttribute("userId") Long userId,Integer classify,Integer type) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,2,type);
public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type, Integer moneyType) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType);
}
@GetMapping("/selectInviteAwardList")
@ApiOperation("查询邀请奖励列表")
public Result selectInviteAwardList(Integer page,Integer limit){
return Result.success().put("data",inviteAwardService.page(new Page<>(page,limit),new QueryWrapper<InviteAward>().orderByAsc("invite_count")));
public Result selectInviteAwardList(Integer page, Integer limit) {
return Result.success().put("data", inviteAwardService.page(new Page<>(page, limit), new QueryWrapper<InviteAward>().orderByAsc("invite_count")));
}
@Login
@GetMapping("/selectInviteAwardByUserId")
@ApiOperation("查询当前邀请人数的下一个等级")
public Result selectInviteAwardByUserId(@LoginUser UserEntity userEntity){
public Result selectInviteAwardByUserId(@LoginUser UserEntity userEntity) {
int inviterCount = userService.queryInviterCount(userEntity.getInvitationCode());
return Result.success().put("data",inviteAwardService.getOne(new QueryWrapper<InviteAward>().gt("invite_count",inviterCount)
return Result.success().put("data", inviteAwardService.getOne(new QueryWrapper<InviteAward>().gt("invite_count", inviterCount)
.last(" order by invite_count limit 1")));
}
@Login
@GetMapping("/selectInviteUserListByUserId")
@ApiOperation("查询当前邀请人列表")
public Result selectInviteUserListByUserId(@LoginUser UserEntity userEntity){
return Result.success().put("data",userService.list(new QueryWrapper<UserEntity>().eq("inviter_code",userEntity.getInvitationCode())));
public Result selectInviteUserListByUserId(@LoginUser UserEntity userEntity) {
return Result.success().put("data", userService.list(new QueryWrapper<UserEntity>().eq("inviter_code", userEntity.getInvitationCode())));
}
@Login
@PostMapping("/inviteMoneyConvertUserMoney")
@ApiOperation("收益充值京豆")
public Result inviteMoneyConvertUserMoney(@LoginUser UserEntity userEntity, Long payClassifyId){
return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity,payClassifyId);
public Result inviteMoneyConvertUserMoney(@LoginUser UserEntity userEntity, Long payClassifyId) {
return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity, payClassifyId);
}
}

View File

@@ -88,6 +88,7 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(price);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
userMoneyService.updateMoney(1,userEntity.getUserId(),add.doubleValue());
userMoneyDetails = new UserMoneyDetails();
@@ -98,6 +99,7 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(add);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
//创建订单返回对象
return Result.success();

View File

@@ -166,6 +166,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[分享奖励金豆]");
userMoneyDetails.setContent("获取金豆:" + money);
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -250,6 +251,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[邀请好友]好友名称:" + userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:" + money);
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
result.put("oneUserId", userEntity.getUserId());
result.put("oneMoney", money);
@@ -286,6 +288,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setClassify(2);
userMoneyDetails.setTitle("[邀请好友]好友名称:" + userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:" + money);
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
result.put("twoUserId", two.getUserId());
result.put("twoMoney", money);
@@ -315,6 +318,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
title = title + ",二级推广员扣除收益:" + twoMoney;
}
userMoneyDetails.setContent(title + ",到账佣金:" + sumMoney);
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
result.put("sysUserId", sysUserEntity.getUserId());
result.put("qdMoney", sumMoney);