Compare commits

..

No commits in common. "bb6ee4618f4b4af684a4f0bb321a9ce4d8035e9c" and "5924aea9da5a6cc8a3eb8cc18d7cfbeb23ecc648" have entirely different histories.

View File

@ -1582,67 +1582,70 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
@Override @Override
@DSTransactional @DSTransactional
public boolean computeTicket(String ticketId) { public boolean computeTicket(String ticketId) {
// 取主表 // 查子表
DlRepairTickets tickets = baseMapper.selectById(ticketId); List<DlRepairTitem> list = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, ticketId));
// 取子表 // 计算子表
List<DlRepairTitem> titems = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, ticketId)); if (CollectionUtil.isEmpty(list)) {
if (CollectionUtil.isEmpty(titems)) {
throw exception0(500, "没有项目、配件或其他"); throw exception0(500, "没有项目、配件或其他");
} }
// 计算子表 List<DlRepairTitem> updateItems = list.stream().map(item -> {
Map<String, BigDecimal> titemsMap = titems.stream().collect(Collectors.toMap( DlRepairTitem titem = new DlRepairTitem();
DlRepairTitem::getId, titem.setId(item.getId());
item -> { // 取出折扣
BigDecimal discount = item.getItemDiscount() == null ? BigDecimal.ONE : item.getItemDiscount(); BigDecimal discount = item.getItemDiscount() == null ? new BigDecimal("1") : item.getItemDiscount();
BigDecimal itemPrice = item.getItemPrice() == null ? BigDecimal.ZERO : item.getItemPrice(); BigDecimal itemPrice = item.getItemPrice() == null ? BigDecimal.ZERO : item.getItemPrice();
return itemPrice.multiply(BigDecimal.valueOf(item.getItemCount())).multiply(discount); titem.setItemMoney(itemPrice.multiply(BigDecimal.valueOf(item.getItemCount())).multiply(discount));
} return titem;
)); }).collect(Collectors.toList());
titems.forEach(item -> { // 更新
item.setItemMoney(titemsMap.get(item.getId())); titemService.updateBatchById(updateItems);
});
titemService.updateBatchById(titems);
// 计算主表 // 计算主表
// 总数量 // 查新的子表信息
tickets.setCount(titems.stream().mapToInt(DlRepairTitem::getItemCount).sum()); List<DlRepairTitem> newList = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, ticketId));
// 各类总价 DlRepairTickets tickets = new DlRepairTickets();
Map<String, BigDecimal> typePrice = titems.stream() // 计算子项总数
.collect(Collectors.groupingBy(DlRepairTitem::getItemType, int count = newList.stream().mapToInt(DlRepairTitem::getItemCount).sum();
Collectors.mapping(DlRepairTitem::getItemMoney, tickets.setId(ticketId);
Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); tickets.setCount(count);
BigDecimal itemTotalPrice = new BigDecimal("0"); // 分类计算各自的总价和最终工单总价
for (Map.Entry<String, BigDecimal> entry : typePrice.entrySet()) { Map<String, List<DlRepairTitem>> map = newList.stream().collect(Collectors.groupingBy(DlRepairTitem::getItemType));
itemTotalPrice = itemTotalPrice.add(entry.getValue()); // 01项目02配件03其他
switch (entry.getKey()){ tickets.setTotalPrice(BigDecimal.ZERO);
case "01": map.forEach((k, v) -> {
tickets.setProjectPrice(entry.getValue()); BigDecimal reduce = v.stream().map(DlRepairTitem::getItemMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
break; tickets.setTotalPrice(tickets.getTotalPrice().add(reduce));
case "02": if (k.equals("01")) {
tickets.setPartPrice(entry.getValue()); tickets.setProjectPrice(reduce);
break; } else if (k.equals("02")) {
case "03": tickets.setPartPrice(reduce);
tickets.setOtherPrice(entry.getValue()); } else if (k.equals("03")) {
break; tickets.setOtherPrice(reduce);
} }
} });
// 其他费用
// 工单总价还需要变把其他新加的费用也需要算上
// 查主表
DlRepairTickets oldTicket = baseMapper.selectById(ticketId);
// 管理费 // 管理费
BigDecimal managerMoney = ObjectUtil.isNotEmpty(tickets.getManagerMoney()) ? tickets.getManagerMoney() : new BigDecimal("0"); BigDecimal managerMoney = ObjectUtil.isNotEmpty(oldTicket.getManagerMoney()) ? oldTicket.getManagerMoney() : new BigDecimal("0");
// 救援费 // 救援费
BigDecimal rescueMoney = ObjectUtil.isNotEmpty(tickets.getRescueMoney()) ? tickets.getRescueMoney() : new BigDecimal("0"); BigDecimal rescueMoney = ObjectUtil.isNotEmpty(oldTicket.getRescueMoney()) ? oldTicket.getRescueMoney() : new BigDecimal("0");
// 三包费 // 三包费
BigDecimal threePackMoney = ObjectUtil.isNotEmpty(tickets.getThreePackMoney()) ? tickets.getThreePackMoney() : new BigDecimal("0"); BigDecimal threePackMoney = ObjectUtil.isNotEmpty(oldTicket.getThreePackMoney()) ? oldTicket.getThreePackMoney() : new BigDecimal("0");
// 定损费 // 定损费
BigDecimal confirmFaultMoney = ObjectUtil.isNotEmpty(tickets.getConfirmFaultMoney()) ? tickets.getConfirmFaultMoney() : new BigDecimal("0"); BigDecimal confirmFaultMoney = ObjectUtil.isNotEmpty(oldTicket.getConfirmFaultMoney()) ? oldTicket.getConfirmFaultMoney() : new BigDecimal("0");
tickets.setTotalPrice(itemTotalPrice.add(managerMoney).add(rescueMoney).add(threePackMoney).add(confirmFaultMoney)); tickets.setTotalPrice(tickets.getTotalPrice().add(managerMoney).add(rescueMoney).add(threePackMoney).add(confirmFaultMoney));
// 更新订单 // 因为订单是在工单创建的时候就新增了后面加的配件之类的金额没有同步到订单这里同步一下
RepairOrderInfo orderInfo = repairOrderInfoService.getOne(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, ticketId)); RepairOrderInfo orderInfo = repairOrderInfoService.getOne(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, ticketId));
orderInfo.setGoodsPrice(tickets.getTotalPrice()); RepairOrderInfo newOrderInfo = new RepairOrderInfo();
orderInfo.setPayMoney(tickets.getTotalPrice()); newOrderInfo.setId(orderInfo.getId());
repairOrderInfoService.updateById(orderInfo); // 更新商品原价和实付金额
newOrderInfo.setGoodsPrice(tickets.getTotalPrice());
newOrderInfo.setPayMoney(tickets.getTotalPrice());
repairOrderInfoService.updateById(newOrderInfo);
return baseMapper.updateById(tickets) > 0; return baseMapper.updateById(tickets) > 0;
} }
@ -1826,9 +1829,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
/** /**
* 根据工单ID查客户和车辆信息 * 根据工单ID查客户和车辆信息
* *
* @param id id
* @author 小李 * @author 小李
* @date 19:07 2024/11/18 * @date 19:07 2024/11/18
* @param id id
**/ **/
@Override @Override
public CustomerAndCarVO getCusAndCarById(String id){ public CustomerAndCarVO getCusAndCarById(String id){