From 9e1550c4dc5f999dcc6e8cddf94dd59923bc7cc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 23 一月 2024 18:14:29 +0800
Subject: [PATCH] zjh 2024/01/23--4
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index fdb7462..9788811 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1444,30 +1444,21 @@
}
map.put("parentName", projectService.getById(entry.getKey()).getProName());
map.put("list", entry.getValue());
- List<TbTransition> tbTransitionList = entry.getValue();
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
- BigDecimal money1 = new BigDecimal("0.00");
- BigDecimal money2 = new BigDecimal("0.00");
- for (TbTransition tbTransition : tbTransitionList) {
- money1 = money1.add(tbTransition.getOrdPrice());
- money2 = money2.add(tbTransition.getNowPrice());
-// if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
-// tbTransition.setDiscount("0");
-// } else {
-// tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
-// }
-// if (null != tbTransition.getPacId()) {
-// tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
-// }
-// if (null != tbTransition.getParentProId()) {
-// tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
-// }
- }
-// map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
-// map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
- map.put("ordPrice", money1);
- map.put("nowPrice", money2);
- }
+// List<TbTransition> tbTransitionList = entry.getValue();
+// if (null != tbTransitionList && tbTransitionList.size() > 0) {
+// BigDecimal money1 = new BigDecimal("0.00");
+// BigDecimal money2 = new BigDecimal("0.00");
+// for (TbTransition tbTransition : tbTransitionList) {
+// money1 = money1.add(tbTransition.getOrdPrice());
+// money2 = money2.add(tbTransition.getNowPrice());
+// }
+// map.put("ordPrice", money1);
+// map.put("nowPrice", money2);
+// }
+ TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+ .eq(TjPackageProject::getProId, entry.getKey()));
+ map.put("ordPrice", project.getPriceNow());
+ map.put("nowPrice", projectService.getById(entry.getKey()).getPriceNow());
list.add(map);
}
return list;
--
Gitblit v1.8.0