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 @@
customer_reason = #{customerReason},
order_detail_id = #{orderDetailId},
oper_type = #{operType},
+ original_refund = #{originalRefund},
worker_feedback_result = #{workerFeedbackResult},
worker_feedback_reason_type = #{workerFeedbackReasonType},
worker_feedback_reason = #{workerFeedbackReason},
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;
/**
* 支付回调