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

courseMedicine 添加图片

Browse Source 
courseToMedicine 添加初级、选修
This commit is contained in:
wuchunlei
2024-05-28 15:55:32 +08:00
parent 82ba08b1f1
commit 0181e61c14
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,8 @@ public class CourseMedicine {
private Integer sort;
private String icon;
private Date createTime;
@TableLogic

6
src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java
View File

@@ -19,6 +19,12 @@ public class CourseToMedicine {
private Integer sort;
//0隐藏1初级2高级
private Integer level;
//0隐藏1必修2选修
private Integer selective;
private Date createTime;
@TableLogic

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

@@ -58,7 +58,7 @@ public class CourseMedicineServiceImpl extends ServiceImpl<CourseMedicineDao, Co
}
}
this.updateById(courseMedicine);
return R.ok().put("sociology", courseMedicine);
return R.ok().put("medicine", courseMedicine);
}
private List<CourseMedicine> medicals(int id){

17
src/main/java/com/peanut/modules/master/service/impl/UserMergeServiceImpl.java
View File

@@ -50,13 +50,20 @@ public class UserMergeServiceImpl implements UserMergeService {
contributionDao.updateById(c);
}
}
//湖分剩余
LambdaQueryWrapper<UserContributionExchange> exchangeWrapper = new LambdaQueryWrapper<>();
exchangeWrapper.eq(UserContributionExchange :: getUserId,secondUser.getId());
List<UserContributionExchange> exchanges = exchangeDao.selectList(exchangeWrapper);
if (exchanges != null&&exchanges.size()>0) {
for (UserContributionExchange c : exchanges) {
c.setUserId(mainUser.getId());
exchangeDao.updateById(c);
UserContributionExchange exchange = exchangeDao.selectOne(exchangeWrapper);
if (exchange != null) {
LambdaQueryWrapper<UserContributionExchange> mainExchangeWrapper = new LambdaQueryWrapper<>();
mainExchangeWrapper.eq(UserContributionExchange :: getUserId,mainUser.getId());
UserContributionExchange mainExchanges = exchangeDao.selectOne(mainExchangeWrapper);
if (mainExchanges != null) {
mainExchanges.setSurplus(mainExchanges.getSurplus()+exchange.getSurplus());
exchangeDao.updateById(mainExchanges);
}else {
exchange.setUserId(mainUser.getId());
exchangeDao.updateById(exchange);
}
}
//课