From dadbd2659a23784c0fb95f954d5a9ca749f55320 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 18:06:25 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 188 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 172 insertions(+), 16 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 fba5891..dcf20d4 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
@@ -176,7 +176,6 @@
public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
-
boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
if (!b) {
List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
@@ -239,7 +238,8 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
-
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
// if (list != null) {
// for (TjOrderDetail tjOrderDetail : list) {
@@ -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) {
@@ -444,6 +444,21 @@
@Override
@Async("async")
+ public void updateOrdeltile2(TjOrderDetail detail, SysUser sysUser) {
+// for (TjOrderDetail detail : tjOrderDetailList) {
+ detail.setTjStatus(1L);
+ LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjStandard::getProId, detail.getProId());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.updateById(detail);
+// }
+ }
+
+ @Override
+ @Async("async")
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
@@ -492,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) {
@@ -553,10 +570,26 @@
@Override
@Async("async")
public void dockerSetCustomerLisByRedis(List<Long> ksproList, String ksId) {
+
List<TjCustomer> yjAjaxResult = getYjAjaxResult(ksproList);
List<TjCustomer> wjAjaxResult = getWjAjaxResult(ksproList);
redisCache.setCacheMapValue(ksId + "ks", "wj", wjAjaxResult);
redisCache.setCacheMapValue(ksId + "ks", "yj", yjAjaxResult);
+ }
+
+ @Override
+ @Async("async")
+ public void dockerSetYjCustomerByRedis(Long orderId,Long ksId) {
+ //宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉
+ getDgYjAjaxResult(orderId,ksId);
+ }
+
+ @Override
+ @Async("async")
+ public void dockerSetWjCustomerByRedis(Long orderId,Long ksId) {
+
+ //鏈(鍗曚釜瀛樺叆)0鏈,1宸叉
+ getDgWjAjaxResult(orderId,ksId);
}
@Override
@@ -695,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());
@@ -1267,7 +1301,7 @@
}
}
- //宸叉
+ //宸叉(鏁翠綋瀛樺叆)
public List<TjCustomer> getYjAjaxResult(List<Long> ksproList) {
List<TjCustomer> customerLis = new ArrayList<>();
LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
@@ -1282,6 +1316,7 @@
() -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
for (Long orderId : orderIds) {
+
if (null != orderId) {
TjOrder order = orderService.getById(orderId);
if (null == order) {
@@ -1342,7 +1377,7 @@
return customerLis;
}
- //鏈
+ //鏈(鏁翠綋瀛樺叆)
public List<TjCustomer> getWjAjaxResult(List<Long> ksproList) {
List<TjCustomer> customerLis = new ArrayList<>();
LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
@@ -1357,6 +1392,9 @@
() -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
for (Long orderId : orderIds) {
+// for (Long aLong : ksproList) {
+// getDgWjAjaxResult(orderId,aLong);
+// }
if (null != orderId) {
TjOrder order = orderService.getById(orderId);
if (null == order) {
@@ -1404,11 +1442,15 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
+ if(null !=byId){
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
}
+
customerLis.add(customer);
}
}
@@ -1416,6 +1458,122 @@
}
return customerLis;
}
+
+ //宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉
+ public void getDgYjAjaxResult(Long orderId,Long ksId) {
+ if (null != orderId) {
+ TjOrder order = orderService.getById(orderId);
+ if (null != order) {
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.eq(TjOrderDetail::getTjStatus, 0);
+ qww.isNotNull(TjOrderDetail::getFlowingWaterId);
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ 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) {
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : lists) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive() == 1) {
+ break;
+ }
+ }
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+ if (order.getTjType().equals("1")) {
+ customer.setTjType("鍥綋");
+ }
+ if (order.getTjType().equals("2")) {
+ customer.setTjType("涓汉");
+ }
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjNumber(order.getTjNumber());
+ customer.setTjStatus(1L);
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wq.in(TjOrderRemark::getType, 0, 3);
+ List<TjOrderRemark> list = orderRemarkService.list(wq);
+ if (null != list && list.size() > 0) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TjOrderRemark remark : list) {
+ TjProject byId = projectService.getById(remark.getProId());
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+ customer.setNotCheckeds(String.valueOf(stringBuilder));
+ if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
+ }
+ redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"1",customer);
+ }
+ }
+ }
+}
+
+
+ //鏈(鍗曚釜瀛樺叆)0鏈,1宸叉
+ public void getDgWjAjaxResult(Long orderId,Long ksId) {
+ if (null != orderId) {
+ TjOrder order = orderService.getById(orderId);
+ if (null == order) {
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if (null != customer) {
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.isNotNull(TjOrderDetail::getFlowingWaterId);
+ List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
+ if (null != lists) {
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : lists) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive()==1){
+ break;
+ }
+ }
+ }
+
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+
+ if (order.getTjType().equals("1")) {
+ customer.setTjType("鍥綋");
+ }
+ if (order.getTjType().equals("2")) {
+ customer.setTjType("涓汉");
+ }
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
+ customer.setTjStatus(0L);
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wq.in(TjOrderRemark::getType, 0, 3);
+ List<TjOrderRemark> list = orderRemarkService.list(wq);
+ if (null != list && list.size() > 0) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TjOrderRemark remark : list) {
+ TjProject byId = projectService.getById(remark.getProId());
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+ 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);
+ }
+ }
+ }
+ }
+
//宸插
private List<TjCustomer> getYsResult(String config) {
@@ -1542,14 +1700,12 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
- List<Long> longList = new ArrayList<>();
- for (String str : split) {
- if(!"".equals(str)){
- longList.add(Long.valueOf(str));
- }
- }
-// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
- //parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
+// List<Long> longList = new ArrayList<>();
+// for (String str : split) {
+// if(!"".equals(str)){
+// longList.add(Long.valueOf(str));
+// }
+// }
parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
--
Gitblit v1.8.0