From 71598a471bc9230d39329389d6a43d294e918630 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 十二月 2023 18:04:45 +0800
Subject: [PATCH] zjh 2023/12/06--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 250602e..3683ad2 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
@@ -1674,8 +1674,54 @@
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
if(null !=tjCustomer){
TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
-
- return AjaxResult.success(order);
+ if(null !=order){
+ List<Map<String, Object>> list = new ArrayList<>();
+ if(order.getPacId().equals("o")){
+ List<Long> longList = remarkService.getTjProIdsByTjNum(order.getTjNumber());
+ for (Long aLong : longList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName", "鍗曢」");
+ map.put("proId",aLong);
+ map.put("pacId",null);
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice", proPrice);
+ list.add(map);
+ }
+ }
+ if(!order.getPacId().equals("o")){
+ List<Long> longList = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
+ TjPackage aPackage = tjPackageService.getById(order.getPacId());
+ for (Long aLong : longList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName",aPackage.getPacName());
+ map.put("pacId",aPackage.getPacId());
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice",tjPackageProjectService.getPacProPriceByPacIdAndPro(aLong,order.getPacId()));
+ list.add(map);
+ }
+
+ List<Long> longList1 = remarkService.getTjProIdsByTjNumAndPacIc(order.getTjNumber(),order.getPacId());
+ for (Long aLong : longList1) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("pacName", "鍗曢」");
+ map.put("proId",aLong);
+ map.put("pacId",null);
+ map.put("parentName", projectService.getById(aLong).getProName());
+ map.put("list",projectService.getTjProjectListBySoneId(String.valueOf(aLong)));
+ BigDecimal proPrice = projectService.getById(aLong).getProPrice();
+ map.put("ordPrice", proPrice);
+ map.put("nowPrice", proPrice);
+ list.add(map);
+ }
+ }
+ return AjaxResult.success(list);
+ }
}
return AjaxResult.success("鏆傛棤鍘嗗彶璁板綍");
}
--
Gitblit v1.8.0