From 2677bfa34ae082e5e7ad9bbb32b7339025f1fb5e Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 30 Nov 2022 01:05:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20seata=E5=AE=9E=E9=AA=8C=E5=AE=A4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seata/service/impl/SeataServiceImpl.java  | 44 -------------------
 .../youlai/mall/oms/api/OrderFeignClient.java |  2 +-
 .../controller/admin/OmsOrderController.java  |  3 +-
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java b/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java
index 8e78e268..b65dc071 100644
--- a/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java
+++ b/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java
@@ -36,49 +36,6 @@ public class SeataServiceImpl implements SeataService {
     private static Long memberId = 1l; // 会员ID
     private static Long orderId = 1l; // 订单ID
 
-    /**
-     * 模拟订单支付
-     *
-     * @return
-     */
-    @Override
-    public boolean payOrder(SeataForm seataForm) {
-
-        log.info("========扣减商品库存========");
-        skuFeignClient.deductStock(skuId, 1); // 扣减库存
-
-        log.info("========扣减账户余额========");
-        memberFeignClient.deductBalance(memberId, 1000 * 100l); // 扣款1000
-
-        log.info("========修改订单状态========");
-        orderFeignClient.updateOrderStatus(orderId, 201, seataForm.isOrderEx()); // 已支付
-
-        return true;
-    }
-
-    /**
-     * 模拟订单支付(分布式事务)
-     *
-     * @param seataForm
-     * @return
-     */
-    @Override
-    @GlobalTransactional
-    public boolean payOrderWithGlobalTx(SeataForm seataForm) {
-        log.info("========扣减商品库存(Seata)========");
-        skuFeignClient.deductStock(skuId, 1); // 扣减库存
-
-        log.info("========修改订单状态(Seata)========");
-        orderFeignClient.createOrder(orderId, 201, seataForm.isOrderEx()); // 已支付
-
-        log.info("========修改订单状态(Seata)========");
-        orderFeignClient.updateOrderStatus(orderId, 201, seataForm.isOrderEx()); // 已支付
-
-        log.info("========扣减账户余额(Seata)========");
-        memberFeignClient.deductBalance(memberId, 1000 * 100l); // 扣款1000
-        return true;
-    }
-
     /**
      * 获取模拟数据
      *
@@ -115,7 +72,6 @@ public class SeataServiceImpl implements SeataService {
     @Override
     public boolean resetData() {
         skuFeignClient.updateStock(skuId, 999); // 还原库存
-        memberFeignClient.updateBalance(memberId, 10000000 * 100); // 还原余额
         orderFeignClient.updateOrderStatus(orderId, 101, false); // 待支付
         return true;
 
diff --git a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java
index dad4bd13..8bef780a 100644
--- a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java
+++ b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java
@@ -44,5 +44,5 @@ public interface OrderFeignClient {
      * @return
      */
     @PostMapping("/api/v1/orders")
-    Result<String> createOrder(SeataOrderDTO orderDTO, boolean openEx);
+    Result<String> createOrder(@RequestBody SeataOrderDTO orderDTO, @RequestParam boolean openEx);
 }
diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java
index e1f390d8..cb03946d 100644
--- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java
+++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java
@@ -23,8 +23,9 @@ import java.util.List;
 import java.util.Optional;
 
 /**
+ * 订单控制层
+ *
  * @author huawei
- * @email huawei_code@163.com
  * @date 2020/12/30
  */
 @Api(tags = "「管理端」订单管理")
-- 
GitLab