From ce6fc16f568cc3c396e141f1f9a7e16d3abf802d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Aug 2022 16:59:55 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 12322cb..453bf97 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -23,6 +23,7 @@
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -284,6 +285,7 @@
//获取退款订单信息
Long orderId = apiLeaderRefundOrderDto.getOrderId();
Long itemId = apiLeaderRefundOrderDto.getItemId();
+
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
@@ -291,6 +293,17 @@
return new FebsResponse().fail().message("退款失败，请联系客服人员");
}
MallRefundEntity mallRefundEntity = mallRefundEntities.get(0);
+
+ Integer agreeState = apiLeaderRefundOrderDto.getAgreeState() == null? 2:apiLeaderRefundOrderDto.getAgreeState();
+ if(2 == agreeState){
+ //更新订单详情
+ mallOrderItem.setState(1);
+ mallOrderItemMapper.updateById(mallOrderItem);
+ //更新退款订单
+ mallRefundEntity.setState(2);
+ mallRefundEntity.setUpdatedTime(DateUtil.date());
+ mallRefundMapper.updateById(mallRefundEntity);
+ }
//退款订单编号
String orderNo = mallOrderInfo.getOrderNo();
//退款退款编号
@@ -322,8 +335,16 @@
mallOrderItemMapper.updateById(mallOrderItem);
//更新退款订单
mallRefundEntity.setState(1);
+ mallRefundEntity.setUpdatedTime(DateUtil.date());
mallRefundMapper.updateById(mallRefundEntity);
mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ if(CollUtil.isEmpty(mallOrderItemList)){
+ MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
+ mallOrderRefund.setStatus(6);
+ mallOrderInfoMapper.updateById(mallOrderRefund);
+ }
}else{
mallRefundEntity.setState(2);
mallRefundMapper.updateById(mallRefundEntity);
@@ -332,4 +353,16 @@
return new FebsResponse().success().message("退款成功");
}
+ @Override
+ public FebsResponse refundOrderInfo(ApiRefundOrderInfoDto apiRefundOrderInfoDto) {
+ Long orderId = apiRefundOrderInfoDto.getOrderId();
+ Long itemId = apiRefundOrderInfoDto.getItemId();
+
+ List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, null);
+ if(CollUtil.isEmpty(mallRefundEntities)){
+ return new FebsResponse().fail().message("退款信息不存在");
+ }
+ return new FebsResponse().success().data(mallRefundEntities.get(0));
+ }
+
}
--
Gitblit v1.9.1