From 5c8b625228f96c18a1d4170eb1890854076f183e Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 10 Oct 2022 22:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=8D=95=EF=BC=8C=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B5=81=E7=A8=8B=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/AfterServiceRecordServiceImpl.java   | 6 +++---
 .../resources/mapper/order/AfterServiceRecordMapper.xml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
index 7ebafe88..994fcabf 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
@@ -122,7 +122,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         AfterServiceRecord afterServiceRecord = this.selectAfterServiceRecordById(param.getId());
         Assert.notNull(afterServiceRecord, "售后记录不存在！");
         // 实际同意,需要发起退款，减少原单分账金额-调用退款接口
-        if(param.getCustomerFinalCheck() == 1){
+        if(param.getCustomerFinalCheck() != null && param.getCustomerFinalCheck() == 1){
             OrderDetail orderDetail = orderDetailService.selectById(afterServiceRecord.getOrderDetailId());
             Assert.notNull(orderDetail, "子单不存在！");
             FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(afterServiceRecord.getOrderDetailId());
@@ -159,8 +159,8 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
                 throw new BaseException("发起退款异常!");
             }
         }
-        afterServiceRecord.setUpdateTime(DateUtils.getNowDate());
-        return afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
+        param.setUpdateTime(DateUtils.getNowDate());
+        return afterServiceRecordMapper.updateAfterServiceRecord(param);
     }
 
     /**
diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
index b01e3322..9f48790e 100644
--- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
@@ -113,7 +113,7 @@
     </delete>
 
     <delete id="deleteAfterServiceRecordByIds" parameterType="String">
-        delete from after_service_record where customer_final_check != 1 and id in
+        delete from after_service_record where (customer_final_check is NULL or customer_final_check != 1) and id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>