From ebf137da711b31c62330ac551e86b0ca7c434a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 3 Jul 2024 20:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E9=80=80=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/service/impl/OrdersServiceImpl.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 9220d00..4f38d5d 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
@@ -640,17 +640,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     }
 
     private Result insertPackageOrders(Orders orders) throws Exception{
-
         BigDecimal payMoney = BigDecimal.ZERO;
         List<OrdersMassage> ordersMassageList = orders.getOrdersMassageList();
         UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassageList.get(0).getMassageId());
         orders.setUserPackageId(userPackageDetail.getMainId());
         orders.setUserPackageDetailId(userPackageDetail.getId());
-
         if(userPackageDetail.getStatus().equals(1)){
             return Result.error("此服务项目已经被使用，无法重复使用！");
         }
-
         BigDecimal price = BigDecimal.ZERO;
         BigDecimal packagePrice = BigDecimal.ZERO;
         String massageTypeName = "";
@@ -2781,10 +2778,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         Orders orders = baseMapper.selectById(ordersId);
         //状态 1待支付 2待服务 3待评论 4已取消  5已完成  6进行中  7技师出发 8技师到达 9用户已支付技师待接单 10待补单
         if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
-
             return Result.error("补差价的单据无法生成待补单！");
         }
-        if (orders.getStatus() == 8 || orders.getStatus() == 9) {
+        if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10) {
             if(orders.getUserPackageDetailId() !=null){
                 return cancelSupplementPackageOrders(userId,orders,isAuto,type);
             }else{