diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index 445bd0e..4c8f98d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -120,7 +120,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { detailDto.setCosts(newTotalPrice); } } - if (detailDto.getReliefCost() != null) { + if (detailDto.getReliefChangeCost() != null) { + totalCost.subtract(detailDto.getReliefChangeCost()); + } else if (detailDto.getReliefCost() != null) { totalCost.subtract(detailDto.getReliefCost()); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 39c426a..68b7bcd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -123,7 +123,9 @@ public class OrderServiceImpl implements OrderService { detailDto.setCosts(newTotalPrice); } } - if (detailDto.getReliefCost() != null) { + if (detailDto.getReliefChangeCost() != null) { + totalReliefPrice.add(detailDto.getReliefChangeCost()); + } else if (detailDto.getReliefCost() != null) { totalReliefPrice.add(detailDto.getReliefCost()); } } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 2b95641..03b44f6 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -194,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hh.rent_over_time, hh.change_cost as changeCost, hh.relief_cost as reliefCost, + hh.relief_change_cost as reliefChangeCost, CASE WHEN DATE(hh.rent_over_time) = DATE(hh.pre_outbound_time) THEN 1 ELSE TIMESTAMPDIFF(DAY, hh.pre_outbound_time, hh.rent_over_time) + 1 @@ -275,6 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hh.rent_over_time, hh.change_cost as changeCost, hh.relief_cost as reliefCost, + hh.relief_change_cost as reliefChangeCost, CASE WHEN DATE(hh.rent_over_time) = DATE(hh.pre_outbound_time) THEN 1 ELSE TIMESTAMPDIFF(DAY, hh.pre_outbound_time, hh.rent_over_time) + 1 @@ -298,6 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.manage_type, mt.lease_price as dayLeasePrice, hh.relief_cost as reliefCost, + hh.relief_change_cost as reliefChangeCost, CASE WHEN DATE(hh.relief_start_time) = DATE(hh.relief_end_time) THEN 1 ELSE TIMESTAMPDIFF(DAY, hh.relief_start_time, hh.relief_end_time) + 1