From e9191e6d4485d94c75f76762b4926439503c20c6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 14 九月 2023 14:29:10 +0800
Subject: [PATCH] zjh 2023/09/14---1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 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 4c7dad4..338ecb8 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
@@ -128,6 +128,9 @@
@Resource
private ITjRulesService rulesService;
+ @Autowired
+ private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
+
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -858,9 +861,9 @@
//涓汉
if ("2".equals(tjOrder.getTjType())) {
-// asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
return AjaxResult.success(tjNumber);
}
@@ -936,6 +939,7 @@
} else {
tbTransitionList = redisCache.getCacheList(cusId);
}
+ //濂楅
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
@@ -949,11 +953,12 @@
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
- asyncService.addRedisTransitionPac(cusId, pacId, ppList);
+// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
+ asyncService.saveRedisTransitionByPacId(cusId, pacId,proIds);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
- BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.DOWN);
+ BigDecimal 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);
@@ -961,11 +966,6 @@
TbTransition tbTransition = new TbTransition();
tbTransition.setCusId(cusId);
tbTransition.setPacId(pacId);
-// if (null != tjProject.getProPrice()) {
-// tbTransition.setOrdPrice(tjProject.getProPrice());
-// } else {
-// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
-// }
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));
@@ -989,8 +989,13 @@
}
}
}
+
+ //鍗曢」
if (null != proIds && proIds.size() > 0) {
- asyncService.addRedisTransitionPro(cusId, proIds);
+ //寮傛淇濆瓨鏁版嵁搴撹〃
+// asyncService.addRedisTransitionPro(cusId, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId,null,proIds);
+
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
@@ -1000,7 +1005,6 @@
if (null != project) {
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) {
@@ -1296,9 +1300,6 @@
List<Map<String, Object>> list = new ArrayList<>();
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
- LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
- wq.eq(TbTransition::getCusId, cusId);
- wq.eq(TbTransition::getParentProId, entry.getKey());
Long pacId = entry.getValue().get(0).getPacId();
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
@@ -1315,21 +1316,20 @@
for (TbTransition tbTransition : tbTransitionList) {
money1 = money1.add(tbTransition.getOrdPrice());
money2 = money2.add(tbTransition.getNowPrice());
- if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
- tbTransition.setDiscount("0");
- } else {
- tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
- }
- if (null != tbTransition.getPacId()) {
- tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
- }
- if (null != tbTransition.getParentProId()) {
- tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
- }
+// if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
+// tbTransition.setDiscount("0");
+// } else {
+// tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
+// }
+// if (null != tbTransition.getPacId()) {
+// tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
+// }
+// if (null != tbTransition.getParentProId()) {
+// tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
+// }
}
// map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
// map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
-
map.put("ordPrice", money1);
map.put("nowPrice", money2);
}
@@ -1548,4 +1548,33 @@
wq.eq(TbTransition::getCusId,cusId);
return AjaxResult.success(transitionService.remove(wq));
}
+
+ public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+ long l = System.currentTimeMillis();
+
+
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),String.valueOf(tjOrder.getOrderId()),sysUser.getNickName(),String.valueOf(sysUser.getUserId()));
+ //淇敼姣忛」鐨勫師浠风幇浠�
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),discount);
+
+ //娣诲姞remark琛ㄦ暟鎹�
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()),String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }
+
+ System.out.println("杩欐浠ｇ爜鏃堕棿"+( l - (System.currentTimeMillis()) ));
+ }
+
}
--
Gitblit v1.8.0