From 8c7934e10d0990b901e9f79c362c1d95209cd447 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期二, 18 六月 2024 11:52:51 +0800
Subject: [PATCH] hisPDF工具类
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 6dcfd41..a44347b 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
@@ -851,14 +851,16 @@
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
+// if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
+
+
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -1034,10 +1036,13 @@
String config = configService.selectConfigByKey("sfkqdyhis");
if(null !=config && config.equals("Y")){
hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+ }else {
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ tjOrderService.updateById(tjOrder);
}
-// tjCustomer.setCardId("0");
-// tjCustomerService.updateById(tjCustomer);
-
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1684,7 +1689,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1738,7 +1743,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -2334,6 +2339,11 @@
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
transitionService.updateTbTransitionByTjNum(tjNum);
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if(null !=customer){
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ }
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (configByKey.equals("Y")){
HashMap<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0