From f61c65658100a64f64cb14c64f27934702d1812e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 15:41:40 +0800
Subject: [PATCH] fix 若赠送积分不足，则减去所有赠送积分
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 8 +++++++-
1 files changed, 7 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 614933f..e97f141 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
@@ -424,7 +424,7 @@
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
// 未发货则退运费，发货了则不退
- if (orderInfo.getStatus() == 2) {
+ if (beforeStatus == 2) {
orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
} else {
orderRefund.setAmount(orderInfo.getAmount());
@@ -437,6 +437,12 @@
orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
+ // 未发货则退运费，发货了则不退
+ if (beforeStatus == 2) {
+ orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
+ } else {
+ orderRefund.setAmount(orderInfo.getAmount());
+ }
mallOrderRefundMapper.updateById(orderRefund);
}
--
Gitblit v1.9.1