From f53e1241b5787bff563696b03162a9e0534ff8bd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 12 Sep 2023 10:24:43 +0800
Subject: [PATCH] 优惠卷
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index d88caad..4265f7a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
@@ -20,6 +21,7 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
+import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
import cc.mrbird.febs.pay.model.OrderStateDto;
@@ -64,6 +66,9 @@
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final MallMemberMapper mallMemberMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final RedisUtils redisUtils;
+
+ private final IApiMallTeamLeaderService apiMallTeamLeaderService;
@@ -181,6 +186,16 @@
@ControllerEndpoint(operation = "订单退款-拒绝", exceptionMessage = "操作失败")
public FebsResponse disagreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
return adminMallOrderService.disagreeRefund(id);
+ }
+
+ /**
+ * 退款操作
+ * @return
+ */
+ @PostMapping(value = "/refundOperation")
+ @ControllerEndpoint(operation = "订单退款", exceptionMessage = "操作失败")
+ public FebsResponse refundOperation(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {
+ return apiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
}
/**
@@ -533,7 +548,7 @@
}
String fileName = file.getOriginalFilename();
- String dirPath = "/home/javaweb/webresource/qianAYi/";
+ String dirPath = "/home/javaweb/webresource/blnka/";
File saveFile = new File(new File(dirPath).getAbsolutePath() + File.separator + fileName);
if (!saveFile.exists()) {
@@ -639,7 +654,8 @@
if (parentId == null) {
ViewMallOrderController.orderIdsStr = "";
}
- long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
+ String existToken = redisUtils.getString("ADMIN_GOODS_CNT");
+ long[] longs = StrUtil.splitToLong(existToken, ',');
mallOrderItem.setOrderIdsStr(longs);
Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
return new FebsResponse().success().data(data);
--
Gitblit v1.9.1