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

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

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

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

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

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

@@ -297,7 +297,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             String value = commonInfoService.findOne(914).getValue();
             BigDecimal v = new BigDecimal(value);
             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.setPayDiamond(courseDetails.getPrice().multiply(v));
             } else {

src/main/resources/application.yml

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