yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改项目报错的问题

This commit is contained in:
yangjun 2024-07-10 17:29:14 +08:00
parent 6f6c48d63b
commit 5f3c0c4f55
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -2040,7 +2040,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
massageMoney = massageMoney.subtract(orders.getCouponMoney());
}
BigDecimal projectBenefits = massageMoney;
if(orders.getPayWay().equals(5)){
if(oldOrders.getPayWay().equals(5)){
BigDecimal rate = new BigDecimal(commonInfoService.findOne(449).getValue());
orders.setWalletRate(rate);
rate = rate.divide(new BigDecimal(100));
@ -2110,6 +2110,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setOneUserMoney(oneUserMoney);
pingMoney = pingMoney.subtract(oneUserMoney);
orders.setPingMoney(pingMoney);
orders.setStatus(9);
//总差价不变，则修改原单据
baseMapper.updateById(orders);
ordersMassageService.removeByOrdersId(orders.getOrdersId());
@ -4603,7 +4604,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}
}else{
String value1 = commonInfoService.findOne(395).getValue();
@ -4626,22 +4627,22 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}else if(orders.getIsSupplement() == 2){
Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId());
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
int timeDifference = orders.getDuration()-oldOrders.getDuration();
if(timeDifference>0){
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 "));
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id desc limit 1 "));
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
Map<String,Object> map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId());
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
//技师占用时间表插入新订单号的多出来的服务时间
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}else{
//技师占用时间表插入新订单号的同时间
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id"));
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id"));
if(artificerTimeList!=null && artificerTimeList.size()>0){
for(int i=0; i<artificerTimeList.size(); i++){
ArtificerTime artificerTime = artificerTimeList.get(i);
@ -4674,9 +4675,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
//删除技师占用时间表数据
artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()));
//插入技师占用时间表新订单
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
//插入技师占用时间表原订单
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOldOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOldOrdersId());
}
}else{
String serveTime = orders.getServeTime();
@ -4695,7 +4696,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
this.insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}
}
}
@ -4987,7 +4988,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
this.insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId());
insertArtificerTime((ArrayList)map.get("timeList"),orders1.getArtificerId(),orders1.getOrdersId());
}
}else{
String value1 = commonInfoService.findOne(395).getValue();