From fcbe872780bf4c87535bf2b59a8d99649654a92e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 24 一月 2024 16:27:51 +0800
Subject: [PATCH] zjh 2024/01/24--2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 e5ca640..f8c5ffc 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
@@ -420,7 +420,7 @@
tjRefundVo.setTjName(customer.getCusName());
tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(customer.getCusIdcard());
DictComp dictComp = compService.getById(order.getFirmId());
if(null !=dictComp){
tjRefundVo.setTjComp(dictComp.getCnName());
@@ -483,7 +483,7 @@
if (null != tjNum) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.likeLeft(TjOrder::getTjNumber, tjNum);
- wq1.eq(TjOrder::getCheckStatus, 0);
+// wq1.eq(TjOrder::getCheckStatus, 0);
List<TjOrder> orderList = orderService.list(wq1);
if (null != orderList && orderList.size() > 0) {
for (TjOrder order : orderList) {
@@ -496,10 +496,10 @@
if (null != customer) {
TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
- tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
- tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ tjRefundVo.setTjName(customer.getCusName());
+ tjRefundVo.setTjPhone(customer.getCusPhone());
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ tjRefundVo.setIdCard(customer.getCusIdcard());
if (null != order.getFirmId()){
DictComp byId = compService.getById(order.getFirmId());
if(null != byId){
@@ -542,6 +542,7 @@
} else {
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber());
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
@@ -576,7 +577,6 @@
}
}*/
String s = tjFlowingWaterService.getDiscount(OrderId);
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(), String.valueOf(project.getProId()));
if(null !=pacId){
TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
.eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
@@ -592,6 +592,16 @@
project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
}
}
+ }
+ TjPackageProject ppp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+ .eq(TjPackageProject::getProId,"1735504273274236929"));
+ List<TjFlowingWater> list = tjFlowingWaterService.list(new LambdaQueryWrapper<TjFlowingWater>()
+ .eq(TjFlowingWater::getOrderId, order)
+ .eq(TjFlowingWater::getPayStasus, 2));
+ if(null != ppp && tjProjectList.size() > 0 &&null !=list&& list.size()>0){
+ TjProject project = projectService.selectTjProjectByProId(1735504273274236929L);
+ project.setProOrdPrice(project.getProPrice());
+ tjProjectList.add(project);
}
}
return AjaxResult.success(tjProjectList);
@@ -619,6 +629,7 @@
wq.ne(TjOrderDetail::getTjStatus,3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber());
if (null != detailList && detailList.size() > 0) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
for (TjOrderDetail detail : detailList) {
@@ -635,7 +646,6 @@
// bigDecimal1 = bigDecimal1.add(transition.getOrdPrice());
// }
String s = tjFlowingWaterService.getDiscount(orderId);
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(), String.valueOf(project.getProId()));
TjRefundProInfoVo proInfoVo = new TjRefundProInfoVo();
if(null !=pacId){
@@ -678,7 +688,7 @@
tjFlowingWater.setRefundTime(new Date());
tjFlowingWater.setIsAddition("N");
tjFlowingWater.setPayStasus(2L);
- tjFlowingWater.setWaterId(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId("TF"+SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
tjFlowingWater.setCopeWith(tjFlowingWater.getRefundPrice());
if (tjFlowingWaterService.save(tjFlowingWater)){
--
Gitblit v1.8.0