From 3800f84259bf243c5d48eec128903161a64f75ab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 11:05:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 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 296c30f..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
@@ -191,6 +191,13 @@
}
memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
+
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayMethod("积分支付");
+ orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+ orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
return orderInfo.getOrderNo();
}
@@ -275,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("该订单不能退款");
}
@@ -290,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