From 3953474a88378e2d367b59a52b716aa483894dc0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 18 Dec 2024 17:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/service/impl/LeaseRepairRecordServiceImpl.java      | 4 +++-
 .../bonus/material/order/service/impl/OrderServiceImpl.java   | 4 +++-
 .../main/resources/mapper/material/order/OrderInfoMapper.xml  | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

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