From 8621fd09be0d89653391f2570d0878e4b3a9f0b5 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 13 九月 2023 11:58:38 +0800
Subject: [PATCH] zjh 2023/09/13---2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 6 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 116 --------------------------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 4 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 5 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 8 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAsyncServiceImpl.java | 4 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 4 +
7 files changed, 27 insertions(+), 120 deletions(-)
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 91fb13e..66a9729 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
@@ -254,122 +254,6 @@
return AjaxResult.error();
}
- /* private void extracted(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer) {
- List<TjConsumables> list2 = new ArrayList<>();
- String[] tjProIds = tjFlowingWater.getTjProIds();
- for (String tjProId : tjProIds) {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, tjProId);
- List<Long> proIds = projectService.list(wq0).stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrderDetail detail = new TjOrderDetail();
- detail.setTjStatus(0L);
- detail.setOrderId(tjFlowingWater.getOrderId());
- detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detail.setProId(Long.valueOf(tjProId));
- detail.setIsAddition("Y");
- detailService.save(detail);
- for (Long proId : proIds) {
- TjOrderDetail detail1 = new TjOrderDetail();
- detail1.setTjStatus(0L);
- detail1.setOrderId(tjFlowingWater.getOrderId());
- detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detail1.setProId(proId);
- detail1.setIsAddition("Y");
- detailService.save(detail1);
- }
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
- wqq.in(TbTransition::getProId, proIds);
- List<TbTransition> tbTransitionList = transitionService.list(wqq);
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
- for (TbTransition transition : tbTransitionList) {
- TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
- //瀛愰」
- if (null != tjProject) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setProId(transition.getProId());
- tjChargingStandard.setPrice(transition.getNowPrice());
- tjChargingStandard.setProName(tjProject.getProName());
- chargingStandardService.save(tjChargingStandard);
- }
- }
- //鐖堕」
- TjProject parentProject = projectService.getById(tjProId);
- if (null != parentProject) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
- }
- }
- }
- //鐖堕」鑰楁潗
- ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
- for (TjConsumables tjConsumables : collect) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setConsumablesId(tjConsumables.getId());
- tjChargingStandard.setPrice(tjConsumables.getPrice());
- tjChargingStandard.setProName(tjConsumables.getMakings());
- tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
- tjChargingStandard.setCompany(tjConsumables.getSpecifications());
- chargingStandardService.save(tjChargingStandard);
- }
- }*/
-
- //澶囩敤娣诲姞鏀惰垂鏄庣粏
- /*private void extracted(TjOrder order, List<TjConsumables> list2, List<TbTransition> tbTransitionList) {
- for (TbTransition transition : tbTransitionList) {
- TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
- //瀛愰」
- if (null != tjProject) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setProId(transition.getProId());
- tjChargingStandard.setPrice(transition.getNowPrice());
- tjChargingStandard.setProName(tjProject.getProName());
- chargingStandardService.save(tjChargingStandard);
- }
- }
-
- //鐖堕」
- ArrayList<TbTransition> collect1 = tbTransitionList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbTransition::getParentProId))), ArrayList::new));
- List<Long> parentProIds = collect1.stream().map(TbTransition::getParentProId).collect(Collectors.toList());
- if (parentProIds.size() > 0) {
- for (Long parentProId : parentProIds) {
- TjProject parentProject = projectService.selectTjProjectByProId(parentProId);
- if (null != parentProject) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
- List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
- if (null != proConsumables && proConsumables.size() > 0) {
- for (TjProConsumables tjProConsumables : proConsumables) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- list2.add(tjConsumables);
- }
- }
- }
- }
- }
-
- ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
- for (TjConsumables tjConsumables : collect) {
- TjChargingStandard tjChargingStandard = new TjChargingStandard();
- tjChargingStandard.setTjNum(order.getTjNumber());
- tjChargingStandard.setConsumablesId(tjConsumables.getId());
- tjChargingStandard.setPrice(tjConsumables.getPrice());
- tjChargingStandard.setProName(tjConsumables.getMakings());
- tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
- tjChargingStandard.setCompany(tjConsumables.getSpecifications());
- chargingStandardService.save(tjChargingStandard);
- }
- }*/
/**
* 鍒犻櫎浣撴娴佹按
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 0cbd25b..0cff7c0 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
@@ -1537,8 +1537,10 @@
@PostMapping("/deletedTbTransitionByCusId")
@ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
- public AjaxResult deletedTbTransitionByCusId(@RequestBody String cusId) {
- transitionService.deletedTbTransitionByCusId(cusId);
- return AjaxResult.success();
+ public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusId) {
+ LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
+ wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date());
+ wq.eq(TbTransition::getCusId,cusId);
+ return AjaxResult.success(transitionService.remove(wq));
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 3e60259..f5451b9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -410,6 +410,10 @@
delayService.reservation(tjReservation.getId());
return AjaxResult.success("棰勭害鎴愬姛!!!");
}
+ LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>();
+ remove.between(TbTransition::getCreateTime,DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()),-1),new Date());
+ remove.eq(TbTransition::getCusId,tjReservation.getIdCard());
+ transitionService.remove(remove);
return AjaxResult.error("棰勭害澶辫触");
}
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 c7cd20f..e96c429 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
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Select;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -89,4 +90,7 @@
@Select("SELECT SUM(a.now_price) now_price FROM tb_transition a WHERE cus_id=#{cusId}")
BigDecimal sumNowPrice(String cusId);
+
+ @Select("SELECT MAX(a.create_time) FROM tb_transition a WHERE a.cus_id=#{cusId} ")
+ Date getTbTransitionCreateTimeByCusId(String cusId);
}
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 c2a245d..a365319 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
@@ -5,6 +5,7 @@
import com.ltkj.hosp.domain.TbTransition;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -84,4 +85,8 @@
public String getTbTransitionPacIdByCusIdAndPac(String cusId);
BigDecimal sumNowPrice(String cusId);
+
+
+ //鏍规嵁韬唤璇佸彿鑾峰彇鏈�澶ф椂闂�
+ public Date getTbTransitionCreateTimeByCusId(String cusId);
}
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 ea44d59..e9d7b2c 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
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@@ -124,4 +125,9 @@
public BigDecimal sumNowPrice(String cusId) {
return tbTransitionMapper.sumNowPrice(cusId);
}
+
+ @Override
+ public Date getTbTransitionCreateTimeByCusId(String cusId) {
+ return tbTransitionMapper.getTbTransitionCreateTimeByCusId(cusId);
+ }
}
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 ee77046..eb4c2e4 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
@@ -702,6 +702,8 @@
}
redisCache.setCacheMapValue("cScheck", "ys",customerList);
}
+
+
@Override
@Async("async")
public void tjRefund(List<TjProject> refundPros, String tjNum) {
@@ -1103,7 +1105,7 @@
customer.setTjStatus(1L);
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wq.in(TjOrderRemark::getType, 0,2,3);
+ wq.in(TjOrderRemark::getType, 0,3);
List<TjOrderRemark> list = orderRemarkService.list(wq);
if (null != list && list.size() > 0) {
StringBuilder stringBuilder = new StringBuilder();
--
Gitblit v1.8.0