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:
张松 2025-01-06 19:27:26 +08:00
parent 589fba42b9 8b0699ce73
commit fb34403e34
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/sqx/modules/course/controller/app/AppCourseCollectController.java
View File

@ -22,7 +22,6 @@ public class AppCourseCollectController extends AbstractController {
@Login @Login
@PostMapping("/insertCourseCollect") @PostMapping("/insertCourseCollect")
@ApiOperation("app收藏短剧信息") @ApiOperation("app收藏短剧信息")
@Debounce(interval = 1000, value = "#userId,#courseCollect.courseId,#courseCollect.classify")
public Result insertCourseCollect(@RequestBody CourseCollect courseCollect, @RequestAttribute("userId") Long userId) { public Result insertCourseCollect(@RequestBody CourseCollect courseCollect, @RequestAttribute("userId") Long userId) {
courseCollect.setUserId(userId); courseCollect.setUserId(userId);
return courseCollectService.insertCourseCollect(courseCollect); return courseCollectService.insertCourseCollect(courseCollect);

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

@ -51,7 +51,7 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
@Override @Override
@CacheEvict(value = "app:courseCollect", key = "#courseCollect.userId") @CacheEvict(value = "app:courseCollect", key = "#courseCollect.userId")
public Result insertCourseCollect(CourseCollect courseCollect) { public Result insertCourseCollect(CourseCollect courseCollect) {
// reentrantReadWriteLock.writeLock().lock(); reentrantReadWriteLock.writeLock().lock();
try { try {
if (courseCollect.getClassify() == 3) { if (courseCollect.getClassify() == 3) {
QueryWrapper<CourseCollect> queryWrapper = new QueryWrapper<>(); QueryWrapper<CourseCollect> queryWrapper = new QueryWrapper<>();
@ -101,12 +101,12 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
} }
return Result.success("操作成功！"); return Result.success("操作成功！");
} catch (Exception e) { } catch (Exception e) {
// e.printStackTrace(); e.printStackTrace();
log.error("收藏短剧出错了！" + e.getMessage()); log.error("收藏短剧出错了！" + e.getMessage());
} }
// finally { finally {
// reentrantReadWriteLock.writeLock().unlock(); reentrantReadWriteLock.writeLock().unlock();
// } }
return Result.error("系统繁忙,请稍后再试！"); return Result.error("系统繁忙,请稍后再试！");
} }

4
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@ -297,7 +297,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
String value = commonInfoService.findOne(914).getValue(); String value = commonInfoService.findOne(914).getValue();
BigDecimal v = new BigDecimal(value); BigDecimal v = new BigDecimal(value);
if (courseDetailsId != null) { if (courseDetailsId != null) {
CourseDetails courseDetails = courseDetailsService.getById(courseDetailsId); CourseDetails courseDetails = courseDetailsService.getOne(new LambdaQueryWrapper<CourseDetails>()
.eq(CourseDetails::getDyCourseDetailsId,courseDetailsId)
.eq(CourseDetails::getCourseId,courseId));
orders.setPayMoney(courseDetails.getPrice()); orders.setPayMoney(courseDetails.getPrice());
orders.setPayDiamond(courseDetails.getPrice().multiply(v)); orders.setPayDiamond(courseDetails.getPrice().multiply(v));
} else { } else {

2
src/main/resources/application.yml
View File

@ -151,7 +151,7 @@ pagehelper:
offsetAsPageNum: true offsetAsPageNum: true
rowBoundsWithCount: true rowBoundsWithCount: true
helperDialect: mysql helperDialect: mysql
reasonable: true reasonable: false
supportMethodsArguments: true supportMethodsArguments: true
params: params:
count: countSql count: countSql