From 6f6c48d63b35501017b3820b8fded4077afb8d16 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 14:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=AE=A2=E5=8D=95=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8A=A0=E9=92=9F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 63cb034..b3984df 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 @@ -4603,7 +4603,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(map.get("code").toString().equals("1")){ return Result.error("预约时间正忙，请更换其他时间！"); } - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); } }else{ String value1 = commonInfoService.findOne(395).getValue(); @@ -4626,22 +4626,22 @@ public class OrdersServiceImpl extends ServiceImpl implements if(map.get("code").toString().equals("1")){ return Result.error("预约时间正忙，请更换其他时间！"); } - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); }else if(orders.getIsSupplement() == 2){ - Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId()); int timeDifference = orders.getDuration()-oldOrders.getDuration(); if(timeDifference>0){ - ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id desc limit 1 ")); + ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 ")); String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime(); Map map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId()); if(map.get("code").toString().equals("1")){ return Result.error("预约时间正忙，请更换其他时间！"); } //技师占用时间表插入新订单号的多出来的服务时间 - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); }else{ //技师占用时间表插入新订单号的同时间 - List artificerTimeList = artificerTimeService.list(new QueryWrapper().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id")); + List artificerTimeList = artificerTimeService.list(new QueryWrapper().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id")); if(artificerTimeList!=null && artificerTimeList.size()>0){ for(int i=0; i implements //删除技师占用时间表数据 artificerTimeService.remove(new QueryWrapper().eq("orders_id", orders.getOldOrdersId())); //插入技师占用时间表新订单 - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); //插入技师占用时间表原订单 - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOldOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOldOrdersId()); } }else{ String serveTime = orders.getServeTime(); @@ -4695,7 +4695,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(map.get("code").toString().equals("1")){ return Result.error("预约时间正忙，请更换其他时间！"); } - insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); } } } @@ -4987,7 +4987,7 @@ public class OrdersServiceImpl extends ServiceImpl implements if(map.get("code").toString().equals("1")){ return Result.error("预约时间正忙，请更换其他时间！"); } - insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId()); + this.insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId()); } }else{ String value1 = commonInfoService.findOne(395).getValue();