套餐待补单下单
This commit is contained in:
parent
a20fdf90e4
commit
bde82b2822
|
@ -3316,6 +3316,15 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isAuto == 1) {
|
if (isAuto == 1) {
|
||||||
|
Integer minutes = Integer.valueOf(commonInfoService.findOne(452).getValue());
|
||||||
|
String serveTime = orders.getServeTime();
|
||||||
|
Date serveTimeDate = DateUtils.stringToDate(serveTime,"yyyy-MM-dd HH:mm");
|
||||||
|
serveTimeDate = DateUtils.addDateMinutes(serveTimeDate,minutes);
|
||||||
|
Date currentDate = new Date();
|
||||||
|
if(currentDate.getTime()>serveTimeDate.getTime()){
|
||||||
|
}else{
|
||||||
|
return Result.error("当前单据不满足待补单条件!");
|
||||||
|
}
|
||||||
//按照比例 将扣除的车费钱
|
//按照比例 将扣除的车费钱
|
||||||
BigDecimal taxiMoney = orders.getTaxiMoney();
|
BigDecimal taxiMoney = orders.getTaxiMoney();
|
||||||
BigDecimal sumMoney = orders.getTaxiMoney();//总扣费
|
BigDecimal sumMoney = orders.getTaxiMoney();//总扣费
|
||||||
|
@ -3369,9 +3378,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
baseMapper.updateById(orders);
|
baseMapper.updateById(orders);
|
||||||
cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单,原单的车费已被退/扣,所以只退项目
|
cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单,原单的车费已被退/扣,所以只退项目
|
||||||
}else{
|
}else{
|
||||||
|
BigDecimal taxiMoney = orders.getTaxiMoney();
|
||||||
|
BigDecimal artificerMoney = orders.getArtificerMoney().subtract(taxiMoney);
|
||||||
orders.setRefusalContent("");
|
orders.setRefusalContent("");
|
||||||
orders.setTaxiMoney(BigDecimal.ZERO);
|
orders.setTaxiMoney(BigDecimal.ZERO);
|
||||||
orders.setStatus(10);
|
orders.setStatus(10);
|
||||||
|
orders.setArtificerMoney(artificerMoney);
|
||||||
|
orders.setSumArtificerMoney(artificerMoney);
|
||||||
baseMapper.updateById(orders);
|
baseMapper.updateById(orders);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue