From 903d74d64f8d97f4b176d5454736c35b0268ada0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 31 Dec 2024 16:10:45 +0800
Subject: [PATCH] feat(mall): 为资金流列表添加来源电话字段
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 863f4e6..00ba3cf 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
@@ -2,7 +2,6 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.*;
-import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.SpringContextHolder;
@@ -37,7 +36,10 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -386,6 +388,10 @@
//获取退款订单信息
Long orderId = apiLeaderRefundOrderDto.getOrderId();
Long itemId = apiLeaderRefundOrderDto.getItemId();
+ Integer agreeType = apiLeaderRefundOrderDto.getAgreeType();
+ if(!(1 == agreeType || 2 == agreeType)){
+ return new FebsResponse().fail().message("退款失败，请联系客服人员");
+ }
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
@@ -419,7 +425,34 @@
int orderMoney = orderAmount.multiply(aa).intValue();
//退款退款金额
+// BigDecimal refundAmount = mallRefundEntity.getAmount();
+// List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+// if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
+// if(1==mallOrderItemListOnly.size()){
+// refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+// log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
+// }
+// }
BigDecimal refundAmount = mallRefundEntity.getAmount();
+ if(agreeType == 1){
+ List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
+ if(1==mallOrderItemListOnly.size()){
+ refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
+ }
+ }
+ }else if(agreeType == 2){
+ List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ List<MallOrderItem> mallOrderItemListIng = mallOrderItemMapper.selectListByStateAndOrderId(2,orderId);
+ if(CollUtil.isEmpty(mallOrderItemListOnly) && CollUtil.isNotEmpty(mallOrderItemListIng) ){
+ if(1 == mallOrderItemListIng.size() ){
+ refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
+ }
+ }
+ }
+// refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
BigDecimal bb = new BigDecimal(100);
int refundMoney = refundAmount.multiply(bb).intValue();
@@ -482,7 +515,7 @@
mallRefundEntity.setState(1);
mallRefundEntity.setUpdatedTime(DateUtil.date());
mallRefundMapper.updateById(mallRefundEntity);
- mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"微信退款",2);
+ mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.WECHAT_REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.WECHAT.getValue(),"微信退款",2);
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
if(CollUtil.isEmpty(mallOrderItemList)){
--
Gitblit v1.9.1