将修改志愿者预约时间以及状态的代码单独提为方法：updateVolunteerWorkDateAndTime

leromro-core/src/main/java/com/leromro/core/service/impl/OrderRefundServiceImpl.java

@@ -95,7 +95,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             QueryWrapper<SecondOrder> secondOrderQueryWrapper = new QueryWrapper<SecondOrder>().eq("main_order_id", mainOrderId);
             List<SecondOrder> secondOrderList = secondOrdersMapper.selectList(secondOrderQueryWrapper);
             //通过支付方式来判断是余额还是微信 1 是余额  2是微信
-            if (mainOrders.getPaymentMethod().equals("1")){
+            if (mainOrders.getPaymentMethod().equals("1")) {
                 //修改，用户账户表 把钱数加上
                 UpdateWrapper<ClientAccount> clientAccountUpdateWrapper = new UpdateWrapper<ClientAccount>().eq("user_id", mainOrders.getUserId()).setSql("balance = balance + " + totalPrice);
                 clientAccountMapper.update(null, clientAccountUpdateWrapper);
@@ -107,18 +107,12 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 clientAccountChange.setCreateTime(DateTimeUtil.getNowTime1());
                 clientAccountChangeMapper.insert(clientAccountChange);
 
-            }else if (mainOrders.getPaymentMethod().equals("2")){
+            } else if (mainOrders.getPaymentMethod().equals("2")) {
                 // 微信 支付
 
-            }else {
+            } else {
                 throw new RuntimeException("该支付方式还未开通退款功能");
             }
-            //修改志愿者工作时间表
-            List<VolunteerReservationTime> volunteerReservationTimeList = secondOrderList.stream().map(secondOrder -> {
-                new VolunteerReservationTime();
-                return VolunteerReservationTime.builder().volunteerId(secondOrder.getVolunteerId()).reservationDate(secondOrder.getWorkDate()).reservationTime(secondOrder.getWorkStartTime()).build();
-            }).collect(Collectors.toList());
-            reservationTimeMapper.deleteVolunteerReservationTimeList(volunteerReservationTimeList);
             //修改状态已取消，用主订单Id
             UpdateWrapper<MainOrders> mainOrderUpdateWrapper = new UpdateWrapper<MainOrders>().eq("main_order_id", mainOrderId).set("order_status", "6");
             mainOrdersMapper.update(null, mainOrderUpdateWrapper);
@@ -134,18 +128,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             //修改，小订单表
             UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().eq("main_order_id", mainOrderId).set("order_status", "6");
             secondOrdersMapper.update(null, secondOrderUpdateWrapper);
-            //志愿者预约时间表 还有 修改志愿者工作日的预约状态。
-            //先把志愿者预约状态全部设置为0
-            UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper1 = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).set("has_reservation", 0);
-            workDateMapper.update(null, volunteerWorkDateUpdateWrapper1);
-            //然后在查哪一天有预约，然后再把有的设置为1
-            QueryWrapper<VolunteerReservationTime> reservationTimeQueryWrapper = new QueryWrapper<VolunteerReservationTime>().eq("volunteer_id", mainOrders.getVolunteerId());
-            List<VolunteerReservationTime> reservationTimes = reservationTimeMapper.selectList(reservationTimeQueryWrapper);
-            if (!reservationTimes.isEmpty()) {
-                List<LocalDate> reservationDate = reservationTimes.stream().map(VolunteerReservationTime::getReservationDate).collect(Collectors.toList());
-                UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper12 = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).in("work_date", reservationDate).set("has_reservation", 1);
-                workDateMapper.update(null, volunteerWorkDateUpdateWrapper12);
-            }
+
+            //修改志愿者的工作时间以及日期
+            updateVolunteerWorkDateAndTime(secondOrderList, mainOrders);
+
             //在退款记录标中生成数据，状态为 已退款
             orderRefund.setStatus("2");
             orderRefund.setRefundAmount(totalPrice);
@@ -253,7 +239,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 clientAccountMapper.update(null, clientAccountUpdateWrapper);
             } else if (mainOrders.getPaymentMethod().equals("2")) {
                 //微信退款
-            }else {
+            } else {
                 throw new RuntimeException("该支付方式还未开通退款功能");
             }
             //更改状态 更改更新时间，更改审批状态、退款钱数、原因、图片。
@@ -265,22 +251,10 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             List<Long> secondOrderIdList = secondOrderList.stream().map(SecondOrder::getSecondOrderId).collect(Collectors.toList());
             UpdateWrapper<SecondOrder> secondOrderUpdateWrapper = new UpdateWrapper<SecondOrder>().in("second_order_id", secondOrderIdList).set("order_status", "6");
             secondOrdersMapper.update(null, secondOrderUpdateWrapper);
-            //根据小订单，删除志愿者预约时间表
-            List<VolunteerReservationTime> volunteerReservationTimeList = secondOrderList.stream().map(secondOrder -> {
-                new VolunteerReservationTime();
-                return VolunteerReservationTime.builder().volunteerId(secondOrder.getVolunteerId()).reservationDate(secondOrder.getWorkDate()).reservationTime(secondOrder.getWorkStartTime()).build();
-            }).collect(Collectors.toList());
-            reservationTimeMapper.deleteVolunteerReservationTimeList(volunteerReservationTimeList);
-            //修改志愿者工作日的预约状态。 1先把志愿者预约状态全部设置为0 然后在查哪一天有预约，然后再把有的设置为1
-            UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).set("has_reservation", 0);
-            workDateMapper.update(null, volunteerWorkDateUpdateWrapper);
-            QueryWrapper<VolunteerReservationTime> reservationTimeQueryWrapper = new QueryWrapper<VolunteerReservationTime>().eq("volunteer_id", mainOrders.getVolunteerId());
-            List<VolunteerReservationTime> reservationTimes = reservationTimeMapper.selectList(reservationTimeQueryWrapper);
-            if (!reservationTimes.isEmpty()) {
-                List<LocalDate> reservationDate = reservationTimes.stream().map(VolunteerReservationTime::getReservationDate).collect(Collectors.toList());
-                UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper1 = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).in("work_date", reservationDate).set("has_reservation", 0);
-                workDateMapper.update(null, volunteerWorkDateUpdateWrapper1);
-            }
+
+            //修改志愿者的工作时间以及日期
+            updateVolunteerWorkDateAndTime(secondOrderList,mainOrders);
+
             //向平台流水表更改，减少其中的流水;
             List<PlatformFinance> platformFinanceList = secondOrderList.stream().map(secondOrder -> {
                 new PlatformFinance();
@@ -321,4 +295,25 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
     public List<WebOrderRefundVO> selectWebOrderRefundList(MainOrders mainOrders) {
         return lOrderRefundMapper.selectWebOrderRefundList(mainOrders);
     }
+
+    //修改志愿者的工作时间
+    public void updateVolunteerWorkDateAndTime(List<SecondOrder> secondOrderList, MainOrders mainOrders) {
+        //修改志愿者工作时间表
+        List<VolunteerReservationTime> volunteerReservationTimeList = secondOrderList.stream().map(secondOrder -> {
+            new VolunteerReservationTime();
+            return VolunteerReservationTime.builder().volunteerId(secondOrder.getVolunteerId()).reservationDate(secondOrder.getWorkDate()).reservationTime(secondOrder.getWorkStartTime()).build();
+        }).collect(Collectors.toList());
+        reservationTimeMapper.deleteVolunteerReservationTimeList(volunteerReservationTimeList);
+        //志愿者预约时间表 还有 修改志愿者工作日的预约状态。
+        //先把志愿者预约状态全部设置为0//然后在查哪一天有预约，然后再把有的设置为1
+        UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper1 = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).set("has_reservation", 0);
+        workDateMapper.update(null, volunteerWorkDateUpdateWrapper1);
+        QueryWrapper<VolunteerReservationTime> reservationTimeQueryWrapper = new QueryWrapper<VolunteerReservationTime>().eq("volunteer_id", mainOrders.getVolunteerId());
+        List<VolunteerReservationTime> reservationTimes = reservationTimeMapper.selectList(reservationTimeQueryWrapper);
+        if (!reservationTimes.isEmpty()) {
+            List<LocalDate> reservationDate = reservationTimes.stream().map(VolunteerReservationTime::getReservationDate).collect(Collectors.toList());
+            UpdateWrapper<VolunteerWorkDate> volunteerWorkDateUpdateWrapper12 = new UpdateWrapper<VolunteerWorkDate>().eq("volunteer_id", mainOrders.getVolunteerId()).in("work_date", reservationDate).set("has_reservation", 1);
+            workDateMapper.update(null, volunteerWorkDateUpdateWrapper12);
+        }
+    }
 }