From e3bb90bf7a3761009c8583c6231f5482f87d4b2d Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 08 三月 2024 10:47:00 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 40e7e6e..c4c7007 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
@@ -10,6 +10,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.codec.Base64;
@@ -53,6 +54,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -407,7 +409,7 @@
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -1329,9 +1331,9 @@
for (TjOrderRemark remark : remarkList) {
TjProject project = projectService.getTjProjectById(String.valueOf(remark.getProId()));
if (null != project) {
- if ("N".equals(project.getNeedReport())) {
- continue;
- }
+// if ("N".equals(project.getNeedReport())) {
+// continue;
+// }
remark.setProCheckType(project.getProCheckType());
remark.setProName(project.getProName());
}
@@ -1711,6 +1713,7 @@
if (tjFlowingWater.getPayStasus() == 1L) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ asyncService.addTjChargingStandard(tjOrder,transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId()),sysUser);
}
// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
--
Gitblit v1.8.0