From a51a70b780ef0ed24abb81b096c80649a0255ece Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 七月 2024 19:29:23 +0800
Subject: [PATCH] zjh 2024/07/2-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 192 +++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 90 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 66c90b8..3b21af4 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
@@ -1530,66 +1530,68 @@
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);
- }
+// 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) {
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);
- }
+// 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) {
+ 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);
- }
-
- }
- }
- }
+// 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);
+// }
+//
+// }
+// }
+// }
}
}
}
@@ -1597,53 +1599,63 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
+// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
- List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.size() == 0) {
+ 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;
+// 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 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);
+// 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 (null != tbTransitionList && tbTransitionList.size() > 0) {
// if (redisCache.hasKey(cardId + cusId)) {
// redisCache.deleteObject(cardId + cusId);
// redisCache.setCacheList(cardId + cusId, tbTransitionList);
@@ -1652,9 +1664,9 @@
// 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(map1);
- }
+// List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
+// return AjaxResult.success();
+// }
return AjaxResult.success();
}
--
Gitblit v1.8.0