zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

湖分管理

Browse Source
This commit is contained in:
wuchunlei
2025-04-08 10:39:31 +08:00
parent 2db4d0528c
commit 9265c03749
8 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/peanut/modules/book/controller/MyUserController.java
View File

@@ -18,6 +18,7 @@ import com.peanut.common.utils.MailUtil;
import com.peanut.modules.book.service.*;
import com.peanut.modules.book.to.PageIdDto;
import com.peanut.modules.common.entity.*;
import com.peanut.modules.common.service.UserContributionService;
import com.peanut.modules.common.service.UserInviteRegisterService;
import com.peanut.modules.common.service.UserVipService;
import com.peanut.modules.sys.service.SysUserTokenService;
@@ -57,6 +58,8 @@ public class MyUserController {
private UserInviteRegisterService inviteRegisterService;
@Autowired
private UserVipService userVipService;
@Autowired
private UserContributionService userContributionService;
/**
* 列表
@@ -103,6 +106,12 @@ public class MyUserController {
for (MyUserEntity myUserEntity : myUserEntityPage.getRecords()) {
myUserEntity.setUserVips(userVipService.list(new LambdaQueryWrapper<UserVip>()
.eq(UserVip::getUserId,myUserEntity.getId()).eq(UserVip::getState,0)));
Map map = userContributionService.getMap(new MPJLambdaWrapper<UserContribution>()
.selectSum(UserContribution::getScore).eq(UserContribution::getUserId,myUserEntity.getId()));
myUserEntity.setContributionScore(0+"");
if (map!=null&&map.containsKey("score")){
myUserEntity.setContributionScore(map.get("score").toString());
}
}
return R.ok().put("user",myUserEntityPage);
}

2
src/main/java/com/peanut/modules/common/controller/UserContributionController.java
View File

@@ -41,7 +41,7 @@ public class UserContributionController {
totalWrapper.eq("user_id",userId);
totalWrapper.select("sum(score) as score");
Map map = contributionService.getMap(totalWrapper);
return R.ok().put("list",contributions).put("total",map.get("score"));
return R.ok().put("list",contributions).put("total",map==null?0:map.get("score"));
}
//分类下湖分明细

2
src/main/java/com/peanut/modules/common/entity/MyUserEntity.java
View File

@@ -156,5 +156,7 @@ public class MyUserEntity implements Serializable {
@TableField(exist = false)
private List<UserVip> userVips;
@TableField(exist = false)
private String contributionScore;
}

4
src/main/java/com/peanut/modules/common/entity/UserContribution.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -17,7 +19,7 @@ public class UserContribution {
private Integer userId;
//分数
private Double score;
private BigDecimal score;
//明细
private String detail;

4
src/main/java/com/peanut/modules/common/entity/UserContributionExchange.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -17,7 +19,7 @@ public class UserContributionExchange {
private Integer userId;
//剩余未换分数
private Double surplus;
private BigDecimal surplus;
private Date createTime;

3
src/main/java/com/peanut/modules/common/service/impl/UserInviteRegisterServiceImpl.java
View File

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import java.util.Random;
@@ -35,7 +36,7 @@ public class UserInviteRegisterServiceImpl extends ServiceImpl<UserInviteRegiste
UserContribution userContribution = new UserContribution();
userContribution.setUserId(userId);
userContribution.setDetail("邀请人数达到10人");
userContribution.setScore(1.0);
userContribution.setScore(new BigDecimal(1));
userContribution.setType("11");
userContributionDao.insert(userContribution);
for (UserInviteRegister register:registers){

7
src/main/java/com/peanut/modules/master/controller/UserContributionController.java
View File

@@ -39,6 +39,9 @@ public class UserContributionController {
wrapper.like(MyUserEntity::getName,params.get("userName"));
wrapper.like(MyUserEntity::getNickname,params.get("userName"));
}
if (params.containsKey("userId")&& StringUtils.isNotEmpty(params.get("userId").toString())) {
wrapper.eq(MyUserEntity::getId,params.get("userId"));
}
if (params.containsKey("tel")&& StringUtils.isNotEmpty(params.get("tel").toString())) {
wrapper.like(MyUserEntity::getTel,params.get("tel"));
}
@@ -67,8 +70,8 @@ public class UserContributionController {
}
@RequestMapping("/delUserContribution")
public R delMessage(String id) {
contributionService.removeById(id);
public R delMessage(@RequestBody UserContribution contribution) {
contributionService.removeById(contribution.getId());
return R.ok();
}

2
src/main/java/com/peanut/modules/master/service/impl/UserManageServiceImpl.java
View File

@@ -205,7 +205,7 @@ public class UserManageServiceImpl implements UserManageService {
mainExchangeWrapper.eq(UserContributionExchange :: getUserId,mainUser.getId());
UserContributionExchange mainExchanges = exchangeDao.selectOne(mainExchangeWrapper);
if (mainExchanges != null) {
mainExchanges.setSurplus(mainExchanges.getSurplus()+exchange.getSurplus());
mainExchanges.setSurplus(mainExchanges.getSurplus().add(exchange.getSurplus()));
exchangeDao.updateById(mainExchanges);
}else {
exchange.setUserId(mainUser.getId());