升级订单无法加钟的bug
This commit is contained in:
parent
1e52bbcb9f
commit
6f6c48d63b
|
@ -4603,7 +4603,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
return Result.error("预约时间正忙,请更换其他时间!");
|
return Result.error("预约时间正忙,请更换其他时间!");
|
||||||
}
|
}
|
||||||
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
String value1 = commonInfoService.findOne(395).getValue();
|
String value1 = commonInfoService.findOne(395).getValue();
|
||||||
|
@ -4626,22 +4626,22 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
return Result.error("预约时间正忙,请更换其他时间!");
|
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){
|
}else if(orders.getIsSupplement() == 2){
|
||||||
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
|
Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId());
|
||||||
int timeDifference = orders.getDuration()-oldOrders.getDuration();
|
int timeDifference = orders.getDuration()-oldOrders.getDuration();
|
||||||
if(timeDifference>0){
|
if(timeDifference>0){
|
||||||
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id desc limit 1 "));
|
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 "));
|
||||||
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
|
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
|
||||||
Map<String,Object> map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId());
|
Map<String,Object> map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId());
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
return Result.error("预约时间正忙,请更换其他时间!");
|
return Result.error("预约时间正忙,请更换其他时间!");
|
||||||
}
|
}
|
||||||
//技师占用时间表插入新订单号的多出来的服务时间
|
//技师占用时间表插入新订单号的多出来的服务时间
|
||||||
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
||||||
}else{
|
}else{
|
||||||
//技师占用时间表插入新订单号的同时间
|
//技师占用时间表插入新订单号的同时间
|
||||||
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id"));
|
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id"));
|
||||||
if(artificerTimeList!=null && artificerTimeList.size()>0){
|
if(artificerTimeList!=null && artificerTimeList.size()>0){
|
||||||
for(int i=0; i<artificerTimeList.size(); i++){
|
for(int i=0; i<artificerTimeList.size(); i++){
|
||||||
ArtificerTime artificerTime = artificerTimeList.get(i);
|
ArtificerTime artificerTime = artificerTimeList.get(i);
|
||||||
|
@ -4674,9 +4674,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//删除技师占用时间表数据
|
//删除技师占用时间表数据
|
||||||
artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()));
|
artificerTimeService.remove(new QueryWrapper<ArtificerTime>().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{
|
}else{
|
||||||
String serveTime = orders.getServeTime();
|
String serveTime = orders.getServeTime();
|
||||||
|
@ -4695,7 +4695,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
return Result.error("预约时间正忙,请更换其他时间!");
|
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<OrdersDao, Orders> implements
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
return Result.error("预约时间正忙,请更换其他时间!");
|
return Result.error("预约时间正忙,请更换其他时间!");
|
||||||
}
|
}
|
||||||
insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId());
|
this.insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId());
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
String value1 = commonInfoService.findOne(395).getValue();
|
String value1 = commonInfoService.findOne(395).getValue();
|
||||||
|
|
Loading…
Reference in New Issue