From 8c4968ea3bd61c154c71d40f43a2cc22760fef49 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十月 2023 18:29:54 +0800
Subject: [PATCH] zjh 2023/10/25--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 4f1ebc2..bd6ff4f 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
@@ -539,7 +539,7 @@
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- // LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+ //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
// wqq1.eq(TbTransition::getParentProId, project.getProId());
// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
@@ -558,8 +558,14 @@
project.setProPrice(decimal.setScale(2));
project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
}else {
- project.setProPrice(new BigDecimal("0.00"));
- project.setProOrdPrice(new BigDecimal("0.00"));
+ BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
+ if(null !=decimal1){
+ project.setProPrice(decimal1.setScale(2));
+ project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2));
+ }else {
+ project.setProPrice(new BigDecimal("0.00").setScale(2));
+ project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
+ }
}
}
}
--
Gitblit v1.8.0