From 9cdc2f4dbca0cadbc25b345b90ad213c8d41be3e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 10:08:16 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 1cfe28a..7919c46 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -41,6 +41,8 @@
private final IApiMallMemberWalletService iApiMallMemberWalletService;
+ private final MallMemberPaymentMapper mallMemberPaymentMapper;
+
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@@ -131,8 +133,24 @@
if(status != 1){
return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
}
- mallOrderRefund.setStatus(2);
+ mallOrderRefund.setStatus(5);
mallOrderRefundMapper.updateById(mallOrderRefund);
+
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(mallOrderRefund.getOrderId());
+ mallOrderInfo.setStatus(6);
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+
+ if(!"微信支付".equals(mallOrderInfo.getPayMethod()) && !"支付宝支付".equals(mallOrderInfo.getPayMethod())){
+ //用户钱包增加对应的余额
+ iApiMallMemberWalletService.addBalance(mallOrderInfo.getAmount(),mallOrderInfo.getMemberId());
+ //新增一条资金流水
+ MallMoneyFlow mallMoneyFlow = new MallMoneyFlow();
+ mallMoneyFlow.setMemberId(mallOrderRefund.getMemberId());
+ mallMoneyFlow.setOrderNo(mallOrderInfo.getOrderNo());
+ mallMoneyFlow.setType(4);
+ mallMoneyFlow.setAmount(mallOrderInfo.getAmount());
+ mallMoneyFlowMapper.insert(mallMoneyFlow);
+ }
MallOrderRefundOperation mallOrderRefundOperation = new MallOrderRefundOperation();
mallOrderRefundOperation.setRefundId(mallOrderRefund.getId());
@@ -328,5 +346,16 @@
return new FebsResponse().success();
}
+ @Override
+ public AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id) {
+ AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
+ MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
+ AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallOrderRefund.getMemberId());
+ if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
+ adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
+ }
+ return adminMallMemberPaymentVo;
+ }
+
}
--
Gitblit v1.9.1