bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

减免

This commit is contained in:
sxu 2024-12-18 17:36:19 +08:00
parent 798d661796
commit 3953474a88
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
View File

@ -120,7 +120,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
detailDto.setCosts(newTotalPrice); detailDto.setCosts(newTotalPrice);
} }
} }
if (detailDto.getReliefCost() != null) { if (detailDto.getReliefChangeCost() != null) {
totalCost.subtract(detailDto.getReliefChangeCost());
} else if (detailDto.getReliefCost() != null) {
totalCost.subtract(detailDto.getReliefCost()); totalCost.subtract(detailDto.getReliefCost());
} }
} }

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -123,7 +123,9 @@ public class OrderServiceImpl implements OrderService {
detailDto.setCosts(newTotalPrice); detailDto.setCosts(newTotalPrice);
} }
} }
if (detailDto.getReliefCost() != null) { if (detailDto.getReliefChangeCost() != null) {
totalReliefPrice.add(detailDto.getReliefChangeCost());
} else if (detailDto.getReliefCost() != null) {
totalReliefPrice.add(detailDto.getReliefCost()); totalReliefPrice.add(detailDto.getReliefCost());
} }
} }

3
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -194,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
hh.rent_over_time, hh.rent_over_time,
hh.change_cost as changeCost, hh.change_cost as changeCost,
hh.relief_cost as reliefCost, hh.relief_cost as reliefCost,
hh.relief_change_cost as reliefChangeCost,
CASE CASE
WHEN DATE(hh.rent_over_time) = DATE(hh.pre_outbound_time) THEN 1 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 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.rent_over_time,
hh.change_cost as changeCost, hh.change_cost as changeCost,
hh.relief_cost as reliefCost, hh.relief_cost as reliefCost,
hh.relief_change_cost as reliefChangeCost,
CASE CASE
WHEN DATE(hh.rent_over_time) = DATE(hh.pre_outbound_time) THEN 1 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 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.manage_type,
mt.lease_price as dayLeasePrice, mt.lease_price as dayLeasePrice,
hh.relief_cost as reliefCost, hh.relief_cost as reliefCost,
hh.relief_change_cost as reliefChangeCost,
CASE CASE
WHEN DATE(hh.relief_start_time) = DATE(hh.relief_end_time) THEN 1 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 ELSE TIMESTAMPDIFF(DAY, hh.relief_start_time, hh.relief_end_time) + 1