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 @@
and refund = #{refund}
and agreed_refund = #{agreedRefund}
and customer_final_check = #{customerFinalCheck}
-
- and ( customer_final_check = '0' or customer_final_check is null )
-
+
+
+