From e14e4217b3f53a5cad511b4331cd7c0a40a40db2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 19 十二月 2024 13:52:03 +0800
Subject: [PATCH] zjh202412019
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 82 +++++++++++++---------------------------
1 files changed, 27 insertions(+), 55 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
index 22e4080..68b21fc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
+++ b/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);
-// //鐜颁环璧嬪�煎垽鏂璶ull璧嬪師浠� 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));
}
@@ -436,17 +395,19 @@
BigDecimal money = new BigDecimal("0.00");
tjPackage.setPrice(money);
}
+ tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
if (tjPackageService.save(tjPackage)) {
List<TjProject> tjProjectList = tjPackage.getTjProjectList();
if (null != tjProjectList && tjProjectList.size() > 0) {
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 +419,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"))));
@@ -478,6 +439,7 @@
@ApiOperation(value = "淇敼浣撴濂楅")
//@PreAuthorize("@ss.hasPermi('system:package:edit')")
public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴濂楅瀵硅薄") TjPackage tjPackage) {
+ tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
if (tjPackageService.updateById(tjPackage)) {
List<TjProject> tjProjectList = tjPackage.getTjProjectList();
if (null != tjProjectList && tjProjectList.size() > 0) {
@@ -486,17 +448,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"))));
--
Gitblit v1.8.0