From 1fbd155e09a0e356ac61f65ecf892a8e0fd2aaae Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Mon, 17 Oct 2022 00:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?=
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     | 1 +
 .../com/ghy/payment/service/impl/PayCallbackService.java    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

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 face9999..2396a971 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
@@ -165,7 +165,11 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
                         financialDetailService.updateFinancialDetail(financialDetail);
                         param.setOriginalRefund(refundMoney);
                     } else if (AdapayStatusEnum.failed.code.equals(response.getString("status"))) {
-                        throw new BaseException("发起退款异常");
+                        if("reverse_amt_over".equals(response.getString("error_code"))){
+                            throw new BaseException("退款金额大于最后一次支付,请撤销改金额再发起");
+                        }else {
+                            throw new BaseException("发起退款异常");
+                        }
                     }
                 } catch (BaseAdaPayException e) {
                     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 3a3e1166..383ecb15 100644
--- a/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
@@ -97,6 +97,7 @@
             <if test="customerReason != null">customer_reason = #{customerReason},</if>
             <if test="orderDetailId != null">order_detail_id = #{orderDetailId},</if>
             <if test="operType != null">oper_type = #{operType},</if>
+            <if test="originalRefund != null">original_refund = #{originalRefund},</if>
             <if test="workerFeedbackResult != null">worker_feedback_result = #{workerFeedbackResult},</if>
             <if test="workerFeedbackReasonType != null">worker_feedback_reason_type = #{workerFeedbackReasonType},</if>
             <if test="workerFeedbackReason != null">worker_feedback_reason = #{workerFeedbackReason},</if>
diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
index e31306af..695a4f3c 100644
--- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
+++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 支付回调