From 8cf225a3c519b49a2f62f4b627cec4002348082d Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 30 一月 2024 08:27:07 +0800
Subject: [PATCH] zjh 本地 2024/01/30 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 6b179a0..56c4b2d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -543,6 +543,7 @@
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber());
+ String s = tjFlowingWaterService.getDiscount(OrderId);
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
@@ -576,7 +577,6 @@
project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
}
}*/
- String s = tjFlowingWaterService.getDiscount(OrderId);
if (null != pacId) {
TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
.eq(TjPackageProject::getProId, String.valueOf(project.getProId())));
@@ -593,15 +593,20 @@
}
}
}
- TjPackageProject ppp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
- .eq(TjPackageProject::getProId, "1735504273274236929"));
+
List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order)
.eq(TjFlowingWater::getPayStasus, 2));
- if (null != ppp && tjProjectList.size() > 0 && null != list && list.size() > 0) {
- TjProject project = projectService.selectTjProjectByProId(1735504273274236929L);
- project.setProOrdPrice(project.getProPrice());
- tjProjectList.add(project);
+ if (null != list && list.size() > 0) {
+ List<TjProject> projectList = projectService.getTjProListByPacIdAndDeptId(pacId);
+ if(null !=projectList && projectList.size()>0){
+ for (TjProject project : projectList) {
+ project.setProOrdPrice(tjPackageProjectService.getPacProPriceByPacIdAndPro(project.getProId(),pacId)
+ .multiply(new BigDecimal(s)).setScale(2));
+ tjProjectList.add(project);
+ }
+ }
+
}
}
return AjaxResult.success(tjProjectList);
--
Gitblit v1.8.0