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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2024-12-30 11:15:55 +08:00
parent 3386e1f6a4 ea7d51450e
commit 46f1bde62e
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/course/entity/CourseCollect.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
@ -14,6 +15,7 @@ import java.io.Serializable;
* @date 2021-03-27
*/
@Data
@Accessors(chain = true)
@TableName("course_collect")
public class CourseCollect implements Serializable {

23
src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java
View File

@ -35,6 +35,29 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
public Result insertCourseCollect(CourseCollect courseCollect) {
reentrantReadWriteLock.writeLock().lock();
try {
if (courseCollect.getClassify() == 3) {
QueryWrapper<CourseCollect> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", courseCollect.getUserId()).eq("classify", 3).eq("course_id", courseCollect.getCourseId());
queryWrapper.orderByDesc("create_time");
queryWrapper.last("limit 1");
CourseCollect collect = baseMapper.selectOne(queryWrapper);
if (collect != null) {
collect.setUpdateTime(DateUtils.format(new Date()));
collect.setCourseCollectId(courseCollect.getCourseCollectId());
baseMapper.updateById(collect);
return Result.success("操作成功！");
}
collect = new CourseCollect()
.setUserId(courseCollect.getUserId())
.setCourseId(courseCollect.getCourseId())
.setCourseDetailsId(courseCollect.getCourseDetailsId())
.setClassify(3)
.setCreateTime(DateUtils.format(new Date()))
.setUpdateTime(DateUtils.format(new Date()));
baseMapper.insert(collect);
return Result.success("操作成功！");
}
CourseCollect courseCollect1 = selectCourseCollectUserIdAnd(courseCollect.getUserId(), courseCollect.getCourseId(),courseCollect.getClassify(),courseCollect.getCourseDetailsId());
if (courseCollect.getType() == 1) {
if(courseCollect1==null){

2
src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java
View File

@ -165,7 +165,7 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
// 金币
int money = Integer.parseInt(commonInfoService.findOne(911).getValue());
if (money > 0) {
if (money > 0 && userEntity.getUserId() != 1) {
userMoneyService.updateMoney(1, userEntity.getUserId(), money);
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(userEntity.getUserId());