From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 b7cecfa..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
@@ -395,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());
//鍒ゆ柇褰撳墠濂楅涓嬫湁娌℃湁杩欎釜椤圭洰 鏈夌殑璇濊烦杩囨坊鍔�
@@ -417,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"))));
@@ -437,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) {
@@ -455,16 +458,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"))));
--
Gitblit v1.8.0