From 06a85788f1bb444100d64b3691c244e8b2508152 Mon Sep 17 00:00:00 2001
From: zengtao01 <zengtao01@tansun.com.cn>
Date: Fri, 15 Nov 2024 10:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storeorder/AppStoreOrderController.java   | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java
index 1897b1cc..7a98913c 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java
@@ -28,8 +28,6 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -48,20 +46,17 @@ public class AppStoreOrderController {
     @Resource
     private MemberAsyncService memberAsyncService;
 
-    private final Lock createLock = new ReentrantLock();
-
-    private final Lock cancelLock = new ReentrantLock();
 
     @GetMapping("/page")
     @Operation(summary = "获得商品订单分页")
     public CommonResult<PageResult<StoreOrderRespVO>> getStoreOrderPage(@Valid StoreOrderPageReqVO pageReqVO) {
-        if(pageReqVO.getUserId()==null){
+        if (pageReqVO.getUserId() == null) {
             pageReqVO.setStatus(StoreOrderStatusEnum.COMPLETE.getCode());
         }
         PageResult<StoreOrderDO> pageResult = storeOrderService.getStoreOrderPage(pageReqVO);
         PageResult<StoreOrderRespVO> bean = BeanUtils.toBean(pageResult, StoreOrderRespVO.class);
         //处理订单详情
-        for (StoreOrderRespVO vo: bean.getList()) {
+        for (StoreOrderRespVO vo : bean.getList()) {
             List<AppStoreOrderDetailVo> listByOrderNo = orderDetailService.getListByOrderNo(vo.getOrderId());
             vo.setDetailDOS(listByOrderNo);
             vo.setStoresName(carteenApi.getCarteenById(vo.getCarteenId()).getStoresName());
@@ -71,15 +66,13 @@ public class AppStoreOrderController {
 
     @PostMapping("/appCreate")
     @Operation(summary = "购物车订单")
-    public CommonResult<Boolean> appCreate(@RequestBody CardDto dto) {
-        createLock.lock();
-       try {
-           AddReqVO  addReqVO= storeOrderService.appCreate(dto);
-           //记录
-           memberAsyncService.batchRecord(addReqVO);
-       }finally {
-           createLock.unlock();
-       }
+    public synchronized CommonResult<Boolean> appCreate(@RequestBody CardDto dto) {
+
+
+        AddReqVO addReqVO = storeOrderService.appCreate(dto);
+        //记录
+        memberAsyncService.batchRecord(addReqVO);
+
         return success(true);
     }
 
@@ -103,15 +96,12 @@ public class AppStoreOrderController {
 
     @GetMapping("/cancel")
     @Operation(summary = "取消订单")
-    public CommonResult<Boolean> cancel(Integer orderId) {
-        cancelLock.lock();
-        try {
-            AddReqVO cancel = storeOrderService.cancel(orderId);
-            //记录
-            memberAsyncService.batchRecord(cancel);
-        }finally {
-            cancelLock.unlock();
-        }
+    public synchronized CommonResult<Boolean> cancel(Integer orderId) {
+
+        AddReqVO cancel = storeOrderService.cancel(orderId);
+        //记录
+        memberAsyncService.batchRecord(cancel);
+
         return success(true);
     }
 
@@ -123,8 +113,8 @@ public class AppStoreOrderController {
 
     @GetMapping("/reduction")
     @Operation(summary = "减免")
-    public CommonResult<Boolean> reduction(Long orderId, BigDecimal money){
-        storeOrderService.reduction(orderId,money);
+    public CommonResult<Boolean> reduction(Long orderId, BigDecimal money) {
+        storeOrderService.reduction(orderId, money);
         return CommonResult.success(true);
     }
 }
\ No newline at end of file