From aa33bb96ba9f14b16c6c7832e21bfbd88983ba6d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 24 一月 2024 18:02:39 +0800
Subject: [PATCH] zjh 2024/01/24--3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index e9981ed..aad0fcf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -281,8 +281,8 @@
orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
for (TbTransition transition : tbTransitionList) {
- transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
- transitionService.updateById(transition);
+// transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
+// transitionService.updateById(transition);
TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
//瀛愰」
if (null != tjProject) {
@@ -507,7 +507,9 @@
}
LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
- wqq.in(TbTransition::getProId, proIds);
+ if ( proIds.size() > 0){
+ wqq.in(TbTransition::getProId, proIds);
+ }
List<TbTransition> tbTransitionList = transitionService.list(wqq);
if (null != tbTransitionList && tbTransitionList.size() > 0) {
for (TbTransition transition : tbTransitionList) {
@@ -726,6 +728,7 @@
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjProject::getProParentId, remark.getProId());
+ wq1.eq(TjProject::getNeedReport, "Y");
List<TjProject> projectList = projectService.list(wq1);
if (null != projectList && projectList.size() > 0) {
List<Long> collect = projectList.stream().map(TjProject::getProId).collect(Collectors.toList());
@@ -1362,7 +1365,6 @@
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
stringBuilder.append(byId.getProName()).append(";");
- getDgYjAjaxResult(orderId,remark.getDeptId());
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
@@ -1441,11 +1443,11 @@
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
stringBuilder.append(byId.getProName()).append(";");
- getDgWjAjaxResult(orderId,remark.getDeptId());
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
}
+
customerLis.add(customer);
}
}
@@ -1467,6 +1469,7 @@
List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
if (null == lists || lists.size() == 0) {
redisCache.deleteCacheMapValue("ks"+ksId+customer.getCusId(),"1");
+ redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"0",customer);
}
if (null != customer) {
//閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
@@ -1561,6 +1564,7 @@
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
}
+// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer);
redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"0",customer);
}
}
--
Gitblit v1.8.0