From ab550ebbfa4b579b373fdd7589e799bbb44362e7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 05 七月 2024 18:37:03 +0800
Subject: [PATCH] zjh 2024/07/5-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 159 +++++++++++++++++++++++++++++++----------------------
1 files changed, 93 insertions(+), 66 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index fd6ce97..819cfa8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -122,7 +122,8 @@
private LtkjEjjfxmzdService ltkjEjjfxmzdService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
-
+ @Autowired
+ private TjProBlService blService;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
long l = System.currentTimeMillis();
@@ -497,6 +498,18 @@
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
+ String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();
+
+ TjProBl proBl=new TjProBl();
+ proBl.setTjh(order.getTjNumber());
+ proBl.setBldh(jxbz);
+ proBl.setBlsj(date);
+ proBl.setBlrdm(sysUser.getUserName());
+ proBl.setBlrmc(sysUser.getNickName());
+ proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
+ blService.save(proBl);
+
List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
@@ -531,6 +544,7 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
@@ -546,6 +560,7 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
for (Long proId : proIds) {
TjOrderDetail detail1 = new TjOrderDetail();
@@ -554,12 +569,13 @@
// detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
detail1.setProId(proId);
detail1.setIsAddition("Y");
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(dates);
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(dates);
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setCreateBy(sysUser.getNickName());
+ detail1.setCreateTime(dates);
+ detail1.setUpdateBy(sysUser.getNickName());
+ detail1.setUpdateTime(dates);
+ detail1.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
}
wqq.in(TbTransition::getProId, proIds);
@@ -643,6 +659,7 @@
detail.setUpdateTime(dates);
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail.setJxbz(jxbz);
tjOrderDetailService.save(detail);
}
@@ -650,56 +667,58 @@
List<TbTransition> tbTransitionList = transitionService.list(wqq);
if (null != tbTransitionList && tbTransitionList.size() > 0) {
for (TbTransition transition : tbTransitionList) {
+ transition.setJxbz(jxbz);
transition.setTjNum(order.getTjNumber());
transition.setCardId(order.getCardId());
transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
transitionService.updateById(transition);
- TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
+// 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());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(dates);
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(dates);
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
+// if (null != tjProject) {
+// TjChargingStandard tjChargingStandard = new TjChargingStandard();
+// tjChargingStandard.setTjNum(order.getTjNumber());
+// tjChargingStandard.setProId(transition.getProId());
+// tjChargingStandard.setPrice(transition.getNowPrice());
+// tjChargingStandard.setProName(tjProject.getProName());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(dates);
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(dates);
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
}
//鐖堕」
-
- TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
- if (null != parentProject && parentProject.getProParentId() == 0) {
- 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);
- }
- }
-
- } else {
- TjProject parentProjects = projectService.getById(tjProId);
- if (null != parentProjects) {
- LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjProConsumables::getProId, parentProjects.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);
- }
- }
- }
- }
+//
+// TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+// if (null != parentProject && parentProject.getProParentId() == 0) {
+// 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);
+// }
+// }
+//
+// } else {
+// TjProject parentProjects = projectService.getById(tjProId);
+// if (null != parentProjects) {
+// LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjProConsumables::getProId, parentProjects.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);
+// }
+// }
+// }
+// }
}
+
}
if(projectList.size()>0){
@@ -716,6 +735,7 @@
tjOrderRemark.setUpdateTime(dates);
tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
TjOrderDetail detail1 = new TjOrderDetail();
@@ -730,6 +750,7 @@
detail1.setUpdateTime(dates);
detail1.setCreateId(String.valueOf(sysUser.getUserId()));
detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
+ detail1.setJxbz(jxbz);
tjOrderDetailService.save(detail1);
if(null !=config && config.equals("Y")){
//妫�楠�
@@ -813,6 +834,8 @@
List<OutpintestapplyDetailsDto> details = dto.getDetails();
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(dto.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -872,6 +895,8 @@
List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -932,6 +957,8 @@
List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
for (OutpintestapplyDetailsDto detail : details1) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+ tree.setSfjx("Y");
+ tree.setJxbz(jxbz);
tree.setCardId(dao.getHisRegistrationId());
LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -974,23 +1001,23 @@
//鐖堕」鑰楁潗
- 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());
- tjChargingStandard.setCreateBy(sysUser.getNickName());
- tjChargingStandard.setCreateTime(dates);
- tjChargingStandard.setUpdateBy(sysUser.getNickName());
- tjChargingStandard.setUpdateTime(dates);
- tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
- tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
- chargingStandardService.save(tjChargingStandard);
- }
+// 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());
+// tjChargingStandard.setCreateBy(sysUser.getNickName());
+// tjChargingStandard.setCreateTime(dates);
+// tjChargingStandard.setUpdateBy(sysUser.getNickName());
+// tjChargingStandard.setUpdateTime(dates);
+// tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
+// chargingStandardService.save(tjChargingStandard);
+// }
}
@Override
--
Gitblit v1.8.0