From 4cce4fe37fbb35d554b8755e7842b0c7191471ac Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 13 九月 2023 14:43:04 +0800
Subject: [PATCH] zjh 2023/09/13---3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 7 +++++--
ltkj-admin/src/main/resources/application.yml | 5 +++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java | 5 +++--
3 files changed, 11 insertions(+), 6 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 0cff7c0..e28c260 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
@@ -1325,8 +1325,11 @@
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.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.add(map);
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
index 674e739..55bdca0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
@@ -233,9 +233,10 @@
List<TjFlowingWater> list = tjFlowingWaterService.list(wq);
for (TjFlowingWater tjFlowingWater : list1) {
TjOrder tjOrder = tjOrderService.selectTjOrderByOrderId(tjFlowingWater.getOrderId());
+ if(null !=tjOrder){
TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
- tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));
-
+ if(null !=customer) tjFlowingWater.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ }
}
map.put("list", list1);
map.put("total",waterPage.getTotal());
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 17dd85c..73af129 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -72,13 +72,14 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 101.42.27.146
+# host: 101.42.27.146
+ host: 192.168.0.101
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password: 654321
+# password: 654321
# 杩炴帴瓒呮椂鏃堕棿
timeout: 60s
lettuce:
--
Gitblit v1.8.0