From d5a0907b0bb734e13cae2092f3a004c30791a0e6 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 14:03:28 +0800
Subject: [PATCH] feat(mall): 添加活动模块 - 新增 ActivityServiceImpl 类实现活动服务 - 添加 AdminActivityController 和 ViewActivityController 控制器处理活动相关请求 - 创建 IActivityService 接口定义活动服务方法 - 设计 MallActivity 实体类表示活动信息 - 增加 MallActivityMapper 接口用于活动数据访问
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 be0ebe8..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
@@ -388,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);
@@ -421,13 +425,31 @@
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();
- 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);
+ 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());
--
Gitblit v1.9.1