费用

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboilerscheduling/EquipBoilerSchedulingServiceImpl.java

@@ -692,9 +692,21 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
             if (equipBoilerSchedulingFeeDO.getChargeType() != null){
                 appointmentConfirmOrderDO.setFeeType(Integer.valueOf(equipBoilerSchedulingFeeDO.getChargeType() + "00"));
             }
-            appointmentConfirmOrderDO.setShouldAmount(equipBoilerSchedulingFeeDO.getShouldAmount().multiply(new BigDecimal(equipBoilerSchedulingItemDOS.size())));
-            appointmentConfirmOrderDO.setServiceAmount(equipBoilerSchedulingFeeDO.getServiceAmount().multiply(new BigDecimal(equipBoilerSchedulingItemDOS.size())));
-            appointmentConfirmOrderDO.setReduceFee(equipBoilerSchedulingFeeDO.getReduceFee().multiply(new BigDecimal(equipBoilerSchedulingItemDOS.size())));
+            
+            int itemCount = equipBoilerSchedulingItemDOS.size();
+            BigDecimal shouldAmount = equipBoilerSchedulingFeeDO.getShouldAmount() != null 
+                    ? equipBoilerSchedulingFeeDO.getShouldAmount() 
+                    : BigDecimal.ZERO;
+            BigDecimal serviceAmount = equipBoilerSchedulingFeeDO.getServiceAmount() != null 
+                    ? equipBoilerSchedulingFeeDO.getServiceAmount() 
+                    : BigDecimal.ZERO;
+            BigDecimal reduceFee = equipBoilerSchedulingFeeDO.getReduceFee() != null 
+                    ? equipBoilerSchedulingFeeDO.getReduceFee() 
+                    : BigDecimal.ZERO;
+            
+            appointmentConfirmOrderDO.setShouldAmount(shouldAmount.multiply(new BigDecimal(itemCount)));
+            appointmentConfirmOrderDO.setServiceAmount(serviceAmount.multiply(new BigDecimal(itemCount)));
+            appointmentConfirmOrderDO.setReduceFee(reduceFee.multiply(new BigDecimal(itemCount)));
 //            appointmentConfirmOrderDO.setFeeNature(equipBoilerSchedulingFeeDO.getFeeNature());
             if (equipBoilerSchedulingFeeDO.getIsExempt() != null){
                 appointmentConfirmOrderDO.setFeeNature(switch (equipBoilerSchedulingFeeDO.getIsExempt()){

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -713,9 +713,22 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
             if (equipPipeSchedulingFeeDO.getChargeType() != null){
                 appointmentConfirmOrderDO.setFeeType(Integer.valueOf(equipPipeSchedulingFeeDO.getChargeType() + "00"));
             }
-            appointmentConfirmOrderDO.setShouldAmount(equipPipeSchedulingFeeDO.getShouldAmount().multiply(new BigDecimal(equipPipeSchedulingItemDOS.size())));
-            appointmentConfirmOrderDO.setServiceAmount(equipPipeSchedulingFeeDO.getServiceAmount().multiply(new BigDecimal(equipPipeSchedulingItemDOS.size())));
-            appointmentConfirmOrderDO.setReduceFee(equipPipeSchedulingFeeDO.getReduceFee().multiply(new BigDecimal(equipPipeSchedulingItemDOS.size())));
+
+            int itemCount = equipPipeSchedulingItemDOS.size();
+            BigDecimal shouldAmount = equipPipeSchedulingFeeDO.getShouldAmount() != null
+                    ? equipPipeSchedulingFeeDO.getShouldAmount()
+                    : BigDecimal.ZERO;
+            BigDecimal serviceAmount = equipPipeSchedulingFeeDO.getServiceAmount() != null
+                    ? equipPipeSchedulingFeeDO.getServiceAmount()
+                    : BigDecimal.ZERO;
+            BigDecimal reduceFee = equipPipeSchedulingFeeDO.getReduceFee() != null
+                    ? equipPipeSchedulingFeeDO.getReduceFee()
+                    : BigDecimal.ZERO;
+
+            appointmentConfirmOrderDO.setShouldAmount(shouldAmount.multiply(new BigDecimal(itemCount)));
+            appointmentConfirmOrderDO.setServiceAmount(serviceAmount.multiply(new BigDecimal(itemCount)));
+            appointmentConfirmOrderDO.setReduceFee(reduceFee.multiply(new BigDecimal(itemCount)));
+
 //            appointmentConfirmOrderDO.setFeeNature(equipPipeSchedulingFeeDO.getFeeNature());
             if (equipPipeSchedulingFeeDO.getIsExempt() != null){
                 appointmentConfirmOrderDO.setFeeNature(switch (equipPipeSchedulingFeeDO.getIsExempt()){