zjh 本地 2024/06/19 --3

zjh

2024-06-19 2ece722bfafa27e3ef5dd5e060ee0624e6f263a6

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

@@ -77,51 +77,10 @@
        List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
        if (null != list && list.size() > 0) {
            for (TjPackage aPackage : list) {
//                StringBuilder allProName = new StringBuilder();
//                StringBuilder allSonName = new StringBuilder();
//
//                List<TjProject> tjProjectList = new ArrayList<>();
//                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
//                if (null != pplist) {
//                    for (TjPackageProject packageProject : pplist) {
//                        StringBuilder allSonProName = new StringBuilder();   //2023.2.7 套餐内每一父项目的子项目字符串
//                        TjProject tjProject = tjProjectService.getById(packageProject.getProId());
//                        if (null != tjProject) {
//                            allProName.append(tjProject.getProName()).append("；");
//                            List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
////                            for (TjProject project : listBySoneId) {
////                                allSonProName.append(project.getProName()).append(";");  //2023.2.7 套餐内每一父项目的子项目字符串
////                                allSonName.append(project.getProName()).append(";");
////                            }
//                            tjProject.setAllSonProName(allSonProName.toString());   //2023.2.7 套餐内每一父项目的子项目字符串
//                            tjProjectList.add(tjProject);
//                            //现价赋值判断null赋原价  2023.2.8
//                            if (packageProject.getPriceNow() != null) {
//                                tjProject.setPriceNow(packageProject.getPriceNow());
//                            } else {
//                                tjProject.setPriceNow(tjProject.getProPrice());
//                            }
//
//                        }
//                    }
//                }
//                aPackage.setTjProjectList(tjProjectList);
                aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
//                aPackage.setAllSonName(allSonName.toString());

//                StringBuffer a = new StringBuffer();
//                List<String> b = new ArrayList<>();
                final String keywords = aPackage.getKeywords();
                if (keywords != null) {
                    final String[] strings = keywords.split(",");
//                    for (String string : strings) {
//                        final MallKeyword byId = mallKeywordService.getById(string);
//                        if (byId != null) {
//                            a.append(byId.getKeyword());
//                            a.append(";");
//                            b.add((byId.getId()).toString());
//                        }
//                    }
                    aPackage.setKeyNames(mallKeywordService.getKeyNames(strings));
                    aPackage.setKeyIds(mallKeywordService.getKeyIds(strings));
                }
@@ -442,11 +401,12 @@
                BigDecimal money = new BigDecimal("0.00");
                for (TjProject tjProject : tjProjectList) {
                    TjPackageProject tjpp = new TjPackageProject();
                    if (null != tjProject.getPriceNow()) {
                        tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                    } else {
                        tjpp.setPriceNow(tjProject.getProPrice());
                    }
//                    if (null != tjProject.getPriceNow()) {
//                        tjpp.setPriceNow(tjProject.getPriceNow().setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                    } else {
//                        tjpp.setPriceNow(tjProject.getProPrice());
//                    }
                    tjpp.setPriceNow(tjProject.getProPrice());
                    tjpp.setProId(tjProject.getProId());
                    tjpp.setPacId(tjPackage.getPacId());
                    //判断当前套餐下有没有这个项目  有的话跳过添加
@@ -458,8 +418,8 @@
                        continue;
                    }
                    ppservice.save(tjpp);
                    if (null != tjProject.getPriceNow()) {
                        money = money.add(tjProject.getPriceNow());
                    if (null != tjProject.getProPrice()) {
                        money = money.add(tjProject.getProPrice());
                    }
                }
                tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -486,17 +446,27 @@
                ppservice.remove(wq);
                BigDecimal money = new BigDecimal(0);
                for (TjProject tjProject : tjProjectList) {
                    TjPackageProject tjpp = new TjPackageProject();
                    if (null != tjProject.getPriceNow()) {
                        tjpp.setPriceNow(tjProject.getPriceNow());
                    } else {
                        tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                    //判断当前套餐下有没有这个项目  有的话跳过添加
                    LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
                    wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
                    wqq.eq(TjPackageProject::getProId,tjProject.getProId());
                    final TjPackageProject one = ppservice.getOne(wqq);
                    if (one!=null){
                        continue;
                    }

                    TjPackageProject tjpp = new TjPackageProject();
//                    if (null != tjProject.getPriceNow()) {
//                        tjpp.setPriceNow(tjProject.getPriceNow());
//                    } else {
//                        tjpp.setPriceNow(new BigDecimal(0).setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                    }
                    tjpp.setPriceNow(tjProject.getProPrice());
                    tjpp.setProId(tjProject.getProId());
                    tjpp.setPacId(tjPackage.getPacId());
                    ppservice.save(tjpp);
                    if (null != tjProject.getPriceNow()) {
                        money = money.add(tjProject.getPriceNow());
                    if (null != tjProject.getProPrice()) {
                        money = money.add(tjProject.getProPrice());
                    }
                }
                tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));