From 23a9da35dea2017431b9fa3305791d484094eb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 13 Jul 2024 11:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=8F=96=E6=B6=88?=
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, 2 insertions(+), 3 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 59faabf..c7b58be 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
@@ -3033,7 +3033,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 userMoneyDetails.setBlFlag(1);
                 userMoneyDetailsService.save(userMoneyDetails);
 
-
                 List<Orders> ordersList = baseMapper.selectList(new QueryWrapper<Orders>().isNotNull("pay_way").eq("parent_id", orders.getOrdersId()));
                 for (Orders orders1 : ordersList) {
                     userMoneyDetails = new UserMoneyDetails();
@@ -3083,7 +3082,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)) {
@@ -3142,6 +3140,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);
         //删除技师占用时间表数据
@@ -3179,7 +3178,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) {
         Orders orders = baseMapper.selectById(ordersId);
         //状态 1待支付 2待服务 3待评论 4已取消  5已完成  6进行中  7技师出发 8技师到达 9用户已支付技师待接单 10待补单
-        if(!orders.getRefusalContent().equals("")){
+        if(orders.getRefusalContent()!=null && !orders.getRefusalContent().equals("")){
         }else{
             if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
                 return Result.error("补差价的单据无法生成待补单！");