From 2951c68cea68f6c0eab405fa5fec7b1d18665ac9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 19:06:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java |   80 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 3 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 3495527..6ffc601 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -2,15 +2,18 @@
 
 import cc.mrbird.febs.common.annotation.ControllerEndpoint;
 import cc.mrbird.febs.common.controller.BaseController;
+import cc.mrbird.febs.common.entity.DeptTree;
 import cc.mrbird.febs.common.entity.FebsResponse;
 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.dto.MallOrderRefundDto;
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.dto.*;
 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 cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
+import cc.mrbird.febs.system.entity.Dept;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +21,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -97,6 +101,76 @@
         return adminMallOrderService.disagreeRefund(id);
     }
 
+    /**
+     * 订单退款-退款确认
+     * @param id
+     * @return
+     */
+    @GetMapping("refundConfirm/{id}")
+    @ControllerEndpoint(operation = "订单退款-退款确认", exceptionMessage = "操作失败")
+    public FebsResponse refundConfirm(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallOrderService.refundConfirm(id);
+    }
+
+    /**
+     * 订单退款地址-列表
+     * @param mallOrderRefundAddressDto
+     * @param request
+     * @return
+     */
+    @GetMapping("addressList")
+    public FebsResponse addressList(MallOrderRefundAddressDto mallOrderRefundAddressDto, QueryRequest request) {
+        Map<String, Object> data = getDataTable(adminMallOrderService.getMallOrderRefundAddressInPage(mallOrderRefundAddressDto, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 订单退款地址-修改
+     */
+    @PostMapping("addressUpdate")
+    @ControllerEndpoint(operation = "订单退款地址-修改", exceptionMessage = "操作失败")
+    public FebsResponse addressUpdate(@Valid AddressUpdateDto addressUpdateDto) {
+        return adminMallOrderService.addressUpdate(addressUpdateDto);
+    }
+
+    /**
+     * 订单退款地址-删除
+     * @param id
+     * @return
+     */
+    @GetMapping("deleteAddress/{id}")
+    @ControllerEndpoint(operation = "订单退款地址-删除", exceptionMessage = "操作失败")
+    public FebsResponse deleteAddress(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallOrderService.deleteAddress(id);
+    }
+
+    /**
+     * 订单退款地址-新增
+     */
+    @PostMapping("addAddress")
+    @ControllerEndpoint(operation = "订单退款地址-新增", exceptionMessage = "操作失败")
+    public FebsResponse addAddress(@Valid AddAddressDto addAddressDto) {
+        return adminMallOrderService.addAddress(addAddressDto);
+    }
+
+    /**
+     * 订单退款地址-选择
+     */
+    @GetMapping("addAddress/tree")
+    @ControllerEndpoint(exceptionMessage = "获取地址失败")
+    public List<AdminAddAddressTreeVo> getRefundAddress(){
+        return adminMallOrderService.getRefundAddress();
+    }
+
+    /**
+     * 订单退款地址-更新退款记录的地址信息
+     */
+    @PostMapping("withAddressUpdate")
+    @ControllerEndpoint(operation = "订单退款地址-更新退款记录的地址信息", exceptionMessage = "操作失败")
+    public FebsResponse withAddressUpdate(@Valid WithAddressUpdateDto withAddressUpdateDto) {
+        return adminMallOrderService.withAddressUpdate(withAddressUpdateDto);
+    }
+
 
 
 

--
Gitblit v1.9.1