From f1389aff3286c9bfd2f454cde95832c3e70ccd11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 10 Jul 2024 10:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/service/impl/OrdersServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index 05e2cbe..771aaba 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -2341,6 +2341,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     }
 
     @Override
+    @Transactional
     public Result cancelOrders(Long userId, Long ordersId) {
         Orders orders = baseMapper.selectById(ordersId);
         //状态 1待支付 2待服务 3待评论 4已取消  5已完成  6进行中  7技师出发 8技师到达 9用户已支付技师待接单 10待补单
@@ -2427,6 +2428,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         }
     }
 
+    @Transactional
     public Result cancelMassageOrders(Long userId, Orders orders, BigDecimal massageDeduction, BigDecimal trafficDeduction, BigDecimal massageRate, BigDecimal trafficRate){
 
         String couponIds = orders.getCouponId();
@@ -2757,7 +2759,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                     orders1.setStatus(4);
                     baseMapper.updateById(orders1);
                 }
-                orders.setStatus(4);
 
                 Artificer artificer2 = artificerService.getById(orders.getArtificerId());
                 if (userId != null && artificer2.getUserId().equals(userId)) {
@@ -2814,6 +2815,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345"));
                 userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
             }
+            orders.setStatus(4);
         }
         baseMapper.updateById(orders);
         //删除技师占用时间表数据
@@ -2838,6 +2840,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         return Result.success();
     }
 
+    @Transactional
     private Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){
         //释放
         UserPackageDetail userPackageDetail = new UserPackageDetail();