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:
Tankaikai 2024-12-26 22:01:25 +08:00
parent 8ba258edb4 c365f1d6b5
commit e2554bae0f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/orders/controller/app/AppOrdersController.java
View File

@ -1,5 +1,6 @@
package com.sqx.modules.orders.controller.app;
import com.sqx.common.annotation.Debounce;
import com.sqx.common.utils.Result;
import com.sqx.modules.app.annotation.Login;
import com.sqx.modules.orders.service.OrdersService;
@ -36,6 +37,7 @@ public class AppOrdersController extends AbstractController {
@Login
@GetMapping("/insertCourseOrders")
@ApiOperation("生成商品订单")
@Debounce(value = "#userId,#courseDetailsId")
public Result insertCourseOrders(Long courseId,Long courseDetailsId, @RequestAttribute("userId") Long userId) {
return ordersService.insertCourseOrders(courseId, courseDetailsId,userId);
}
@ -64,6 +66,7 @@ public class AppOrdersController extends AbstractController {
@Login
@PostMapping("/payOrders")
@ApiOperation("支付订单")
@Debounce(value = "#orderId")
public Result payOrders(Long orderId){
return ordersService.payMoney(orderId);
}

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

@ -242,7 +242,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
@Override
public Result insertCourseOrders(Long courseId, Long courseDetailsId, Long userId) {
log.info("生成商品订单信息接口入参为：{},{}", courseId, userId);
reentrantReadWriteLock.writeLock().lock();
// reentrantReadWriteLock.writeLock().lock();
try {
CourseDetails courseDetail = courseDetailsService.getById(courseDetailsId);
if (courseDetail != null && courseDetail.getIsPrice().equals(2)) {
@ -325,9 +325,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} catch (Exception e) {
log.error("生成商品订单错误！！！" + e.getMessage());
} finally {
reentrantReadWriteLock.writeLock().unlock();
}
// finally {
// reentrantReadWriteLock.writeLock().unlock();
// }
return Result.error("系统繁忙，请稍后再试！");
}