From e75b172925502dbeca943f9d4a0cda04977c4c28 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 15 八月 2024 18:33:21 +0800
Subject: [PATCH] zjh 2024-08-15
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 129 +++----------------------------------------
1 files changed, 9 insertions(+), 120 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 163de7f..eb79a5f 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
@@ -516,7 +516,7 @@
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
+ if (null != customerList && !customerList.isEmpty()) {
List<TjOrder> list = new ArrayList<>();
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
@@ -526,7 +526,7 @@
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
@@ -536,7 +536,7 @@
}
list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ list.get(i).setTjCustomerName(tjCustomer.getCusName());
list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
@@ -597,7 +597,7 @@
}
list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ list.get(i).setTjCustomerName(tjCustomer.getCusName());
list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
if (tjCustomer.getCusIdcard() != null) {
list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
@@ -1554,143 +1554,32 @@
redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
}
}
-// List<TbTransition> tbTransitionList = null;
-// if (!redisCache.hasKey(cardId + cusId)) {
-// tbTransitionList = new ArrayList<>();
-// } else {
-// tbTransitionList = redisCache.getCacheList(cardId + cusId);
-// }
- //濂楅
/*濂楅*/
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
- if (null == list || list.size() == 0) {
+ if (null == list || list.isEmpty()) {
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
-// if (redisCache.hasKey(cardId + cusId + "cusId"))
-// redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
-// if (redisCache.hasKey(cardId + cusId)) {
-// tbTransitionList = new ArrayList<>();
-// redisCache.deleteObject(cardId + cusId);
-// }
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
- if (null != ppList && ppList.size() > 0) {
+ if (null != ppList && !ppList.isEmpty()) {
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
- //寮傛淇濆瓨鏁版嵁搴�
-// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
-// asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
-// for (TjPackageProject tjPackageProject : ppList) {
-// TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
-// if (null != project) {
-//
-// BigDecimal divide = BigDecimal.valueOf(0);
-// if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
-// divide = BigDecimal.valueOf(0);
-// } else {
-// divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
-// }
-// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-// if (null != tjProSonList && tjProSonList.size() > 0) {
-// //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
-// for (TjProject tjProject : tjProSonList) {
-// TbTransition tbTransition = new TbTransition();
-// tbTransition.setCusId(cusId);
-// tbTransition.setPacId(pacId);
-// if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
-// tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
-// tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
-// } else {
-// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
-// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
-// }
-// tbTransition.setParentProId(project.getProId());
-// tbTransition.setParentProName(project.getProName());
-// tbTransition.setProId(tjProject.getProId());
-// tbTransition.setProName(tjProject.getProName());
-// tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
-// tbTransition.setProType(tjProject.getProType());
-// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
-// tbTransitionList.add(tbTransition);
-// }
-//
-// }
-// }
-// }
}
}
}
//鍗曢」
- if (null != proIds && proIds.size() > 0) {
+ if (null != proIds && !proIds.isEmpty()) {
//寮傛淇濆瓨鏁版嵁搴撹〃
-// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
TjProject project = projectService.selectTjProjectByProId(proId);
- if (null != project) { //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ if (null != project) {
List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
- if (null == transitionList || transitionList.size() == 0) {
+ if (null == transitionList || transitionList.isEmpty()) {
transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
}
}
-// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
}
-// for (Long proId : proIds) {
-// List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
-// if (null != transitions && transitions.size() > 0) {
-// continue;
-// }
-// TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
-// if (null != tjProject) {
-//// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-//// if (null != tjProSonList && tjProSonList.size() > 0) {
-//// for (TjProject tjProject : tjProSonList) {
-//// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
-//// if (null != transitionss && transitionss.size() > 0) {
-//// continue;
-//// }
-// TbTransition tbTransition = new TbTransition();
-// tbTransition.setCusId(cusId);
-// tbTransition.setPacId(null);
-// if (null != tjProject.getProPrice()) {
-// tbTransition.setOrdPrice(tjProject.getProPrice());
-// tbTransition.setNowPrice(tjProject.getProPrice());
-// } else {
-// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
-// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
-// }
-// tbTransition.setParentProId(tjProject.getProParentId());
-// if (tjProject.getProParentId() != null) {
-// TjProject byId = projectService.getById(tjProject.getProParentId());
-// if (null != byId) {
-// tbTransition.setParentProName(byId.getProName());
-// }
-// }
-// tbTransition.setParentProName("");
-//
-// tbTransition.setProId(tjProject.getProId());
-// tbTransition.setProName(tjProject.getProName());
-// tbTransition.setProType(tjProject.getProType());
-// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
-// tbTransitionList.add(tbTransition);
-//// }
-//// }
-// }
-// }
}
-
-
-// if (null != tbTransitionList && tbTransitionList.size() > 0) {
-// if (redisCache.hasKey(cardId + cusId)) {
-// redisCache.deleteObject(cardId + cusId);
-// redisCache.setCacheList(cardId + cusId, tbTransitionList);
-// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
-// } else {
-// redisCache.setCacheList(cardId + cusId, tbTransitionList);
-// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
-// }
-// List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
-// return AjaxResult.success();
-// }
return AjaxResult.success();
}
--
Gitblit v1.8.0