From 2351cfc36d87f74ba1aa267e5554e16781dfb44d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 10:22:09 +0800
Subject: [PATCH] fix orderRefund
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 5a68f0e..36a7159 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -282,7 +282,7 @@
throw new FebsException("已提交退款, 请勿重复提交");
}
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) {
+ if (orderInfo.getStatus() != OrderStatusEnum.WAIT_SHIPPING.getValue() && orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该订单不能退款");
}
@@ -297,11 +297,15 @@
orderRefund.setMemberId(member.getId());
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
+ orderRefund.setType(addRefundDto.getType());
+ orderRefund.setBeforeStatus(orderInfo.getStatus());
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.insert(orderRefund);
} else {
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
+ orderRefund.setType(addRefundDto.getType());
+ orderRefund.setBeforeStatus(orderInfo.getStatus());
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.updateById(orderRefund);
}
--
Gitblit v1.9.1