|
|
@@ -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){
|