From 14d0524041e26c34f997db1192e85a4c25d98282 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 11:05:15 +0800
Subject: [PATCH] 20210924
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 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 3bc41a6..3495527 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -6,21 +6,18 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.dto.MallOrderInfoDto;
-import cc.mrbird.febs.mall.entity.MallGoods;
-import cc.mrbird.febs.mall.entity.MallGoodsCategory;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.entity.MallOrderItem;
+import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallOrderRefundOperationMapper;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
import java.util.Map;
@Slf4j
@@ -53,6 +50,56 @@
return adminMallOrderService.deliverGoods(deliverGoodsDto);
}
+ /**
+ * 订单退款-列表
+ * @param mallOrderRefundDto
+ * @param request
+ * @return
+ */
+ @GetMapping("refundList")
+ public FebsResponse getRefundList(MallOrderRefundDto mallOrderRefundDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallOrderService.getRefundListInPage(mallOrderRefundDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 订单退款-详情
+ */
+ @GetMapping("/seeRefund")
+ public FebsResponse seeRefund(QueryRequest request, MallOrderRefund mallOrderRefund,Integer parentId) {
+ if(parentId==null){
+ ViewMallOrderController.idFromRefund=0;
+ }
+ mallOrderRefund.setId(ViewMallOrderController.idFromRefund);
+ Map<String, Object> dataTable = getDataTable(adminMallOrderService.seeRefund(request, mallOrderRefund));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 订单退款-同意
+ * @param id
+ * @return
+ */
+ @GetMapping("agreeRefund/{id}")
+ @ControllerEndpoint(operation = "订单退款-同意", exceptionMessage = "操作失败")
+ public FebsResponse agreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.agreeRefund(id);
+ }
+
+ /**
+ * 订单退款-拒绝
+ * @param id
+ * @return
+ */
+ @GetMapping("disagreeRefund/{id}")
+ @ControllerEndpoint(operation = "订单退款-拒绝", exceptionMessage = "操作失败")
+ public FebsResponse disagreeRefund(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.disagreeRefund(id);
+ }
+
+
+
+
--
Gitblit v1.9.1