From 2a44b33edcde6930a916ffa3863e8c04e1f8efee 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:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A2=9E=E5=8A=A015=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/service/impl/OrdersServiceImpl.java    |  8 ++------
 src/main/resources/mapper/artificer/OrdersDao.xml    | 12 ++++++------
 2 files changed, 8 insertions(+), 12 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 e5963cf..05e2cbe 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
@@ -3261,7 +3261,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                         data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345"));
                         userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
                     }
-                    artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
                 }
                 if(isAuto == 1){
                     //扣车费
@@ -3348,14 +3347,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 BigDecimal payMoney = orders.getPayMoney().subtract(orders.getTaxiMoney());
                 orders.setPayMoney(payMoney);
             }
+            //删除技师占用时间表数据
+            artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
             if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){
                 //此笔单子退车费，并改为取消，再将原单改成待补单
                 orders.setRefusalContent("");
                 orders.setTaxiMoney(BigDecimal.ZERO);
                 orders.setStatus(4);
                 baseMapper.updateById(orders);
-                //删除技师占用时间表数据
-                artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
                 cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单，原单的车费已被退/扣，所以只退项目
             }else{
                 BigDecimal taxiMoney = orders.getTaxiMoney();
@@ -3366,10 +3365,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setArtificerMoney(artificerMoney);
                 orders.setSumArtificerMoney(artificerMoney);
                 baseMapper.updateById(orders);
-                //删除技师占用时间表数据
-                artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
             }
-
         }
         if(type == 2){
             //退项目费
diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml
index f55da5e..f2cd70c 100644
--- a/src/main/resources/mapper/artificer/OrdersDao.xml
+++ b/src/main/resources/mapper/artificer/OrdersDao.xml
@@ -1152,7 +1152,7 @@
                  left join consortia c on c.consortia_id=o.consortia_id
         where o.artificer_id=#{artificerId}
         and o.end_times BETWEEN #{startDate} and #{endDate}
-        and o.status in (3,5)
+        and o.status in (3,5,15)
     </select>
     <!--在线时长-->
     <select id="selectOrdersZxscNum" resultType="java.lang.String">
@@ -1173,14 +1173,14 @@
         from orders o
         where o.artificer_id=#{artificerId}
         and o.end_times BETWEEN #{startTime} and #{endTime}
-        and o.status in (3,5)
+        and o.status in (3,5,15)
     </select>
 
 
     <select id="getDangqiList" resultType="com.sqx.modules.artificer.entity.Orders">
         select a.*,b.massage_img from orders a
         left join massage_type b on a.massage_type_id = b.massage_type_id
-        where a.status in (3,5)
+        where a.status in (3,5,15)
         and a.artificer_id = ${userId}
         and a.end_times BETWEEN #{startTime} and #{endTime} and a.parent_id = 0
         order by serve_time desc
@@ -1189,7 +1189,7 @@
     <select id="getJiazhongList" resultType="com.sqx.modules.artificer.entity.Orders">
         select a.*,b.massage_img from orders a
         left join massage_type b on a.massage_type_id = b.massage_type_id
-        where a.status in (3,5)
+        where a.status in (3,5,15)
         and a.artificer_id = ${userId}
         and a.end_times BETWEEN #{startTime} and #{endTime} and a.parent_id = 0
         <if test="isSfwc != null and isSfwc == 0">
@@ -1208,7 +1208,7 @@
         left join user_recharge uu on uu.orders_id = o.orders_id
         left join massage_type b on o.massage_type_id = b.massage_type_id
         where o.artificer_id=#{userId} and o.parent_id = 0
-        and o.status in (3,5)
+        and o.status in (3,5,15)
         and o.end_times BETWEEN #{startTime} and #{endTime}
         <if test="isSfwc != null and isSfwc == 0">
             and uu.type is null
@@ -1221,7 +1221,7 @@
     <select id="getYjjfList" resultType="com.sqx.modules.artificer.entity.Orders">
         select a.*,a.price as jifen,a.end_times as jftime,b.massage_img  from orders a
         left join massage_type b on a.massage_type_id = b.massage_type_id
-        where a.status in (3,5)
+        where a.status in (3,5,15)
         and a.artificer_id = ${userId}
         and a.end_times BETWEEN #{startTime} and #{endTime}
     </select>