From c84162ef2567ee02a0c94d6df336f78c974aca34 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 20 十二月 2023 18:41:11 +0800
Subject: [PATCH] zjh 本地 2023/12/12 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 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 66a9729..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
@@ -104,7 +104,7 @@
/**
* 鏌ヨ浣撴娴佹按鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:water:list')")
+// @PreAuthorize("@ss.hasPermi('hosp:water:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴娴佹按鍒楄〃")
public TableDataInfo list(TjFlowingWater tjFlowingWater) {
@@ -258,7 +258,7 @@
/**
* 鍒犻櫎浣撴娴佹按
*/
- @PreAuthorize("@ss.hasPermi('hosp:water:remove')")
+// @PreAuthorize("@ss.hasPermi('hosp:water:remove')")
@Log(title = "浣撴娴佹按", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
@@ -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,18 +543,34 @@
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
if (project.getProParentId() == 0) {
- 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);
- BigDecimal bigDecimal = new BigDecimal("0.00");
- BigDecimal bigDecimal1 = new BigDecimal("0.00");
- for (TbTransition transition : tbTransitionList) {
- bigDecimal = bigDecimal.add(transition.getNowPrice());
- bigDecimal1=bigDecimal1.add(transition.getOrdPrice());
+ //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);
+// BigDecimal bigDecimal = new BigDecimal("0.00");
+// BigDecimal bigDecimal1 = new BigDecimal("0.00");
+// for (TbTransition transition : tbTransitionList) {
+// bigDecimal = bigDecimal.add(transition.getNowPrice());
+// bigDecimal1=bigDecimal1.add(transition.getOrdPrice());
+// }
+// project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP));
+// project.setProOrdPrice(bigDecimal1);
+ BigDecimal decimal = transitionService.getTbTransitionPriceAndOrdPrice(customerService.getById(order.getUserId()).getCusIdcard(),
+ project.getProId());
+ String s = tjFlowingWaterService.getDiscount(OrderId);
+ 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));
+ }
}
- project.setProPrice(bigDecimal.setScale(0,BigDecimal.ROUND_UP));
- project.setProOrdPrice(bigDecimal1);
}
}
}
--
Gitblit v1.8.0