From a28c894d35b5ca697bfe455c2d584c7f28ec3722 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 15 十二月 2023 15:51:59 +0800
Subject: [PATCH] 优化项目列表
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 93a98f6..e769abc 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
@@ -418,7 +418,7 @@
tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
- tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
DictComp dictComp = compService.getById(order.getFirmId());
if(null !=dictComp){
tjRefundVo.setTjComp(dictComp.getCnName());
@@ -498,8 +498,12 @@
tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != order.getDictCompName())
- tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
+ if (null != order.getFirmId()){
+ DictComp byId = compService.getById(order.getFirmId());
+ if(null != byId){
+ tjRefundVo.setTjComp(byId.getCnName());
+ }
+ }
if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order.getOrderId())
@@ -539,7 +543,7 @@
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- // LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+ //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
// wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
// wqq1.eq(TbTransition::getParentProId, project.getProId());
// List<TbTransition> tbTransitionList = transitionService.list(wqq1);
@@ -554,8 +558,19 @@
BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(),
project.getProId());
String s = tjFlowingWaterService.getDiscount(OrderId);
- project.setProPrice(decimal.setScale(2));
- project.setProOrdPrice(decimal.multiply(BigDecimal.valueOf(Long.parseLong(s))).setScale(2));
+ if(null !=decimal){
+ project.setProPrice(decimal.setScale(2));
+ project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+ }else {
+ BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
+ if(null !=decimal1){
+ project.setProPrice(decimal1.setScale(2));
+ project.setProOrdPrice(decimal1.multiply(new BigDecimal(s)).setScale(2));
+ }else {
+ project.setProPrice(new BigDecimal("0.00").setScale(2));
+ project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
+ }
+ }
}
}
}
--
Gitblit v1.8.0