From 5289e9842a8889f4128d95501ae80e1e93f4d6ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 17:35:41 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 151 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 f8f77ce..c1ede1b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -2,23 +2,26 @@
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;
-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.List;
import java.util.Map;
@Slf4j
@@ -52,7 +55,18 @@
}
/**
- * 订单退款列表
+ * 订单列表-取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("cancelOrder/{id}")
+ @ControllerEndpoint(operation = "订单列表-取消订单", exceptionMessage = "操作失败")
+ public FebsResponse cancelOrder(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallOrderService.cancelOrder(id);
+ }
+
+ /**
+ * 订单退款-列表
* @param mallOrderRefundDto
* @param request
* @return
@@ -63,6 +77,135 @@
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);
+ }
+
+ /**
+ * 订单退款-退款确认
+ * @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);
+ }
+
+ /**
+ * 商家支付方式-列表
+ * @param payMethodDto
+ * @param request
+ * @return
+ */
+ @GetMapping("payMethodList")
+ public FebsResponse getPayMethodList(PayMethodDto payMethodDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallOrderService.getPayMethodListInPage(payMethodDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 商家支付方式-更新
+ */
+ @PostMapping("payMethodEdit")
+ @ControllerEndpoint(operation = "商家支付方式-更新", exceptionMessage = "操作失败")
+ public FebsResponse payMethodEdit(@Valid PayMethodEditDto payMethodEditDto) {
+ return adminMallOrderService.payMethodEdit(payMethodEditDto);
+ }
+
+
+
+
--
Gitblit v1.9.1