zjh 2024/01/23--4

zjh

2024-01-23 9e1550c4dc5f999dcc6e8cddf94dd59923bc7cc1

zjh 2024/01/23--4

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

@@ -1444,30 +1444,21 @@
            }
            map.put("parentName", projectService.getById(entry.getKey()).getProName());
            map.put("list", entry.getValue());
            List<TbTransition> tbTransitionList = entry.getValue();
            if (null != tbTransitionList && tbTransitionList.size() > 0) {
                BigDecimal money1 = new BigDecimal("0.00");
                BigDecimal money2 = new BigDecimal("0.00");
                for (TbTransition tbTransition : tbTransitionList) {
                    money1 = money1.add(tbTransition.getOrdPrice());
                    money2 = money2.add(tbTransition.getNowPrice());
//                    if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
//                        tbTransition.setDiscount("0");
//                    } else {
//                        tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
//            List<TbTransition> tbTransitionList = entry.getValue();
//            if (null != tbTransitionList && tbTransitionList.size() > 0) {
//                BigDecimal money1 = new BigDecimal("0.00");
//                BigDecimal money2 = new BigDecimal("0.00");
//                for (TbTransition tbTransition : tbTransitionList) {
//                    money1 = money1.add(tbTransition.getOrdPrice());
//                    money2 = money2.add(tbTransition.getNowPrice());
//                    }
//                    if (null != tbTransition.getPacId()) {
//                        tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
//                map.put("ordPrice", money1);
//                map.put("nowPrice", money2);
//                    }
//                    if (null != tbTransition.getParentProId()) {
//                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
//                    }
                }
//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("ordPrice", money1);
                map.put("nowPrice", money2);
            }
            TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
                    .eq(TjPackageProject::getProId, entry.getKey()));
            map.put("ordPrice", project.getPriceNow());
            map.put("nowPrice", projectService.getById(entry.getKey()).getPriceNow());
            list.add(map);
        }
        return list;

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

@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.excelConfig.ExcelUtils;
import com.ltkj.common.task.TaskService;
import com.ltkj.common.utils.SecurityUtils;
@@ -621,6 +622,7 @@
    @PostMapping("/newReservationConfirm")
    @ApiOperation(value = "团体预约确认接口 (新版本)")
    @Transactional
    @RepeatSubmit
    public AjaxResult newReservationConfirm(@RequestBody ConfirmDto dto) {
        //预约的所有人
        List<TjReservation> rightList = dto.getReservations();