From d288985f9efd973f5455a42607b043e32da5fe91 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 13 九月 2023 11:15:36 +0800
Subject: [PATCH] zjh 2023/09/13---1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 22 ++++++++++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java | 14 ++++++++------
2 files changed, 24 insertions(+), 12 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 96cadb5..0cbd25b 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
@@ -959,15 +959,17 @@
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 != 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_UP));
+ 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());
@@ -1531,4 +1533,12 @@
}
return AjaxResult.success(aaa);
}
+
+
+ @PostMapping("/deletedTbTransitionByCusId")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ public AjaxResult deletedTbTransitionByCusId(@RequestBody String cusId) {
+ transitionService.deletedTbTransitionByCusId(cusId);
+ return AjaxResult.success();
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
index 07a3800..ee77046 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java
@@ -820,15 +820,17 @@
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 != 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_UP));
+ 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());
--
Gitblit v1.8.0