From 488cc3665822da42c4a4173d962920c6bd057a3d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 九月 2023 17:57:01 +0800
Subject: [PATCH] zjh 2023/09/15--3
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 29 ++++++++------
ltkj-admin/src/test/java/zjhTest.java | 22 +----------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 10 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 3 +
9 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index bd20863..f2e0ed6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -608,6 +608,7 @@
one.setType(1);
remarkService.updateById(one);
}
+ asyncService.updateCheckType(orderRemark.getTjNumber());
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
asyncService.updateCheckType(orderRemark.getTjNumber());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 92968de..93a98f6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -539,18 +539,23 @@
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
- wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
- wqq1.eq(TbTransition::getParentProId, project.getProId());
- List<TbTransition> tbTransitionList = transitionService.list(wqq1);
- BigDecimal bigDecimal = new BigDecimal("0.00");
- BigDecimal bigDecimal1 = new BigDecimal("0.00");
- for (TbTransition transition : tbTransitionList) {
- bigDecimal = bigDecimal.add(transition.getNowPrice());
- bigDecimal1=bigDecimal1.add(transition.getOrdPrice());
- }
- project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP));
- project.setProOrdPrice(bigDecimal1);
+ // LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
+// wqq1.eq(TbTransition::getParentProId, project.getProId());
+// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
+// BigDecimal bigDecimal = new BigDecimal("0.00");
+// BigDecimal bigDecimal1 = new BigDecimal("0.00");
+// for (TbTransition transition : tbTransitionList) {
+// bigDecimal = bigDecimal.add(transition.getNowPrice());
+// bigDecimal1=bigDecimal1.add(transition.getOrdPrice());
+// }
+// project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP));
+// project.setProOrdPrice(bigDecimal1);
+ BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(),
+ project.getProId());
+ String s = tjFlowingWaterService.getDiscount(OrderId);
+ project.setProPrice(decimal.setScale(2));
+ project.setProOrdPrice(decimal.multiply(BigDecimal.valueOf(Long.parseLong(s))).setScale(2));
}
}
}
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 63d2d2d..b5caa2e 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -48,26 +48,8 @@
@Test
public void test() {
-// util.setDataBase(1);
-// stringRedisTemplate.opsForValue().set("1","1");
-// ExecutorService pool = Executors.newFixedThreadPool(5);
-//
-// for (int i = 1; i < 6; i++) {
-// int finalI = i;
-// pool.execute(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// redisCache.setDataBase(finalI);
-// redisCache.setCacheObject("娴嬭瘯",finalI+"111111111111111111");
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// pool.shutdown();
-// }
-// });
-// }
- log.info("鍢垮樋!!!");
+// redisCache.setCacheObject("璧典匠璞�","hahahahaha");
+// log.info("鍢垮樋!!!");
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index 28116d3..3074a8a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -196,4 +196,14 @@
"\tLEFT JOIN tj_project c ON c.pro_parent_id=b.pro_id\n" +
"WHERE 1=1 AND a.grouping_id =#{groupingId} ")
boolean saveTemoTransitionByGroupingId(@Param("cusId")String cusId,@Param("groupingId")String groupingId);
+
+
+ @Select("SELECT b.price_now FROM \n" +
+ "(SELECT a.pac_id FROM tb_transition a WHERE\n" +
+ "\ta.cus_id = #{cusId} \n" +
+ "GROUP BY\n" +
+ "\ta.pac_id) aa \n" +
+ "LEFT JOIN tj_package_project b\n" +
+ "\tON aa.pac_id=b.pac_id WHERE b.pro_id=#{proId} ")
+ BigDecimal getTbTransitionPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index bf63a6f..88f4d80 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -69,4 +69,7 @@
"\n" +
" tj_flowing_water b ON a.order_id = b.order_id WHERE a.tj_number =#{tjNum} AND a.deleted='0' AND b.deleted='0'")
List<String> getFlowingWaterIds(String tjNum);
+
+ @Select("\tSELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND a.order_id=#{orderId} AND a.discount !='/'")
+ String getDiscount(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index d6aaf97..f749a1e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -99,4 +99,6 @@
void saveRedisTransitionByProId(String cusId, Long proId);
boolean saveTemoTransitionByGroupingId(String cusId,String groupingId);
+
+ BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index c2766ce..80ce564 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -62,4 +62,6 @@
public int deleteTjFlowingWaterById(String id);
List<String> getFlowingWaterIds(String tjNum);
+
+ String getDiscount(String orderId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 4d9334d..e640e4f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -150,4 +150,9 @@
public boolean saveTemoTransitionByGroupingId(String cusId,String groupingId) {
return tbTransitionMapper.saveTemoTransitionByGroupingId(cusId,groupingId);
}
+
+ @Override
+ public BigDecimal getTbTransitionPriceAndOrdPrice(String cusId, Long proId) {
+ return tbTransitionMapper.getTbTransitionPriceAndOrdPrice(cusId,proId);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index 1c7abf4..4b72293 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -97,4 +97,9 @@
public List<String> getFlowingWaterIds(String tjNum) {
return tjFlowingWaterMapper.getFlowingWaterIds(tjNum);
}
+
+ @Override
+ public String getDiscount(String orderId) {
+ return tjFlowingWaterMapper.getDiscount(orderId);
+ }
}
--
Gitblit v1.8.0