From 5da1fd7979e02b1d4ba9c00234af8f2d7a440967 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 15 九月 2023 18:04:35 +0800
Subject: [PATCH] zjh 2023/09/15--3

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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..7329e50 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
@@ -554,8 +554,13 @@
                             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 {
+                                project.setProPrice(new BigDecimal("0.00"));
+                                project.setProOrdPrice(new BigDecimal("0.00"));
+                            }
                         }
                     }
                 }

--
Gitblit v1.8.0