zjh 本地 2024/06/20 --1

zjh

2024-06-20 21bc96d8f12701c187a667a2b66176db04421d06

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

@@ -401,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());
                    //判断当前套餐下有没有这个项目  有的话跳过添加
@@ -417,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"))));
@@ -455,16 +456,17 @@
                    }

                    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"))));
                    }
//                    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"))));