Prechádzať zdrojové kódy

fix(scheduling): 修正设备管道调度费用计算逻辑

- 移除多余的itemCount变量定义
- 修正预约确认订单的费用计算,去除不必要的乘法运算
- 简化服务金额和服务减免的赋值逻辑
- 保持费用类型的正确设置
xuzhancheng 1 mesiac pred
rodič
commit
f09e65ff48

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

@@ -718,7 +718,6 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                 appointmentConfirmOrderDO.setFeeType(Integer.valueOf(equipPipeSchedulingFeeDO.getChargeType() + "00"));
             }
 
-            int itemCount = equipPipeSchedulingItemDOS.size();
             BigDecimal shouldAmount = equipPipeSchedulingFeeDO.getShouldAmount() != null
                     ? equipPipeSchedulingFeeDO.getShouldAmount()
                     : BigDecimal.ZERO;
@@ -729,9 +728,9 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
                     ? 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.setShouldAmount(shouldAmount);
+            appointmentConfirmOrderDO.setServiceAmount(serviceAmount);
+            appointmentConfirmOrderDO.setReduceFee(reduceFee);
 
 //            appointmentConfirmOrderDO.setFeeNature(equipPipeSchedulingFeeDO.getFeeNature());
             if (equipPipeSchedulingFeeDO.getIsExempt() != null){