From 6157a66556fc0655a62dd233117a15ce00d61171 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 18 Dec 2024 12:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/mapper/LeaseRepairRecordMapper.java      |  2 +-
 .../service/impl/LeaseRepairRecordServiceImpl.java | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
index 59b419e..daadf26 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/LeaseRepairRecordMapper.java
@@ -34,7 +34,7 @@ public interface LeaseRepairRecordMapper {
      */
     int insert(LeaseRepairRecord leaseRepairRecord);
 
-    int getCountByOrderId(Integer orderId);
+    int getCountByOrderId(String orderId);
 
     int deleteLeaseRepairRecord(LeaseRepairRecord leaseRepairRecord);
 
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 30c9d92..6c278bc 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
@@ -208,9 +208,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
 
         LeaseRepairRecord leaseRepairRecord = createLeaseRepairRecord(leaseRecordDto);
         // 校验所有记录是否为空
-        if (isAllRecordListsEmpty(leaseRecordDto)) {
-            return insertRecord(leaseRepairRecord);
-        }
+//        if (isAllRecordListsEmpty(leaseRecordDto)) {
+//            return insertRecord(leaseRepairRecord);
+//        }
         try {
             // 处理维修、报废、丢失记录的情况
             return handleAllRecords(leaseRecordDto, new ArrayList<>(maIdSet));
@@ -298,7 +298,13 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
         }
         leaseRepairRecord.setPriceConfirmUser(SecurityUtils.getUserId());
         //将费用确认人信息存入
-        int result = mapper.update(leaseRepairRecord);
+        int count = mapper.getCountByOrderId(leaseRepairRecord.getOrderId());
+        int result = 0;
+        if (count > 0) {
+            result = mapper.update(leaseRepairRecord);
+        } else {
+            result++; //没找到需要更新的记录，默认为是已经处理过了
+        }
         //修改订单状态为已完成
         if (result > 0) {
             leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_FINISHED.getStatus());