zjh20250219

zjh

2025-02-19 c87dee0033340b62e820f7a012ab2d9bfb89b12a

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java

@@ -923,43 +923,45 @@

                TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());

                TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());
                if(null !=dwGrouping){
                    TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());

                LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
                wq.eq(TjReservation::getIdCard, reservation.getIdCard());
                wq.eq(TjReservation::getIsExpire, 2);
                TjReservation one = tjReservationService.getOne(wq);
                if (null != one) {
                    continue;
                }
                LambdaQueryWrapper<TjGroupingPro> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjGroupingPro::getGroupingId, reservation.getGroupingId());
                List<String> proIds = groupingProService.list(wq1).stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
                reservation.setProIds(Joiner.on(",").join(proIds));
                reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
                reservation.setCompanyId(dwGrouping.getDwId());
                reservation.setCompany(dwGrouping.getDwName());
                reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(SysDictData::getDictType, "reservation_pay_type");
                wrapper.eq(SysDictData::getDictValue, reservation.getPayType());
                SysDictData dictData = dictDataService.getOne(wrapper);
                for (Map.Entry<String, Object> entry : parseObj.entrySet()) {
                    String[] split = entry.getValue().toString().split("-");
                    if (split[0].equals(String.valueOf(dictData.getDictCode()))) {
                        reservation.setTjType(dictDataService.selectDictDataById(Long.valueOf(split[1])).getDictValue());
                    LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjReservation::getIdCard, reservation.getIdCard());
                    wq.eq(TjReservation::getIsExpire, 2);
                    TjReservation one = tjReservationService.getOne(wq);
                    if (null != one) {
                        continue;
                    }
                }
                    LambdaQueryWrapper<TjGroupingPro> wq1 = new LambdaQueryWrapper<>();
                    wq1.eq(TjGroupingPro::getGroupingId, reservation.getGroupingId());
                    List<String> proIds = groupingProService.list(wq1).stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
                    reservation.setProIds(Joiner.on(",").join(proIds));
                    reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
                    reservation.setCompanyId(dwGrouping.getDwId());
                    reservation.setCompany(dwGrouping.getDwName());
                    reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                    LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(SysDictData::getDictType, "reservation_pay_type");
                    wrapper.eq(SysDictData::getDictValue, reservation.getPayType());
                    SysDictData dictData = dictDataService.getOne(wrapper);
                    for (Map.Entry<String, Object> entry : parseObj.entrySet()) {
                        String[] split = entry.getValue().toString().split("-");
                        if (split[0].equals(String.valueOf(dictData.getDictCode()))) {
                            reservation.setTjType(dictDataService.selectDictDataById(Long.valueOf(split[1])).getDictValue());
                        }
                    }


                reservation.setPacId(dwDept.getId());
                compPay = compPay.add(dwGrouping.getYsPrice());
                    reservation.setPacId(dwDept.getId());
                    compPay = compPay.add(dwGrouping.getYsPrice());
//                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
                taskService.addTask(new TjReservationTask(reservation.getId(),
                        DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
                    reservation.setTeamNo(teamNo);
                    reservation.setYxts(dto.getYxts());
                    tjReservationService.save(reservation);
                    taskService.addTask(new TjReservationTask(reservation.getId(),
                            DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
                }
            }

            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();