From cbfb18a235cdb8281cfbccffc28266af842819e1 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 15 Oct 2022 01:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=8D=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=94=AE=E5=90=8E=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AfterServiceRecordServiceImpl.java    | 10 ++++++----
 .../mapper/order/AfterServiceRecordMapper.xml          |  6 +++---
 2 files changed, 9 insertions(+), 7 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 18968f53..e5456062 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
@@ -156,12 +156,14 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
                 try {
                     response = adapayService.payReverse(orderMaster.getDeptId(), financialMaster.getPaymentId(), String.valueOf(refundMoney));
                     if (AdapayStatusEnum.succeeded.code.equals(response.getString("status"))) {
-                        if (AdapayStatusEnum.succeeded.code.equals(response.getString("status"))) {
-                            financialDetailService.updateFinancialDetail(financialDetail);
-                        }
+                        financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney));
+                        financialMasterService.updateFinancialMaster(financialMaster);
+                        financialDetailService.updateFinancialDetail(financialDetail);
+                    } else if (AdapayStatusEnum.failed.code.equals(response.getString("status"))) {
+                        throw new BaseException(response.getString("error_msg"));
                     }
                 } catch (BaseAdaPayException e) {
-                    throw new BaseException("发起退款异常!");
+                    throw new BaseException(e.getMessage());
                 }
             }
         }
diff --git a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
index 0dff5062..13202594 100644
--- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
@@ -40,9 +40,9 @@
             <if test="refund != null "> and refund = #{refund}</if>
             <if test="agreedRefund != null "> and agreed_refund = #{agreedRefund}</if>
             <if test="customerFinalCheck != null "> and customer_final_check = #{customerFinalCheck}</if>
-            <if test="customerFinalCheck == null">
-                and ( customer_final_check = '0' or customer_final_check is null )
-            </if>
+<!--            <if test="customerFinalCheck == null">-->
+<!--                and ( customer_final_check = '0' or customer_final_check is null )-->
+<!--            </if>-->
         </where>
     </select>