From 2351cfc36d87f74ba1aa267e5554e16781dfb44d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 10:22:09 +0800
Subject: [PATCH] fix orderRefund
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 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 3496655..f8f77ce 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -1,20 +1,24 @@
package cc.mrbird.febs.mall.controller;
+import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.controller.BaseController;
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.entity.MallGoods;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.dto.MallOrderRefundDto;
+import cc.mrbird.febs.mall.entity.*;
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 javax.validation.Valid;
import java.util.Map;
@Slf4j
@@ -27,7 +31,7 @@
private final IAdminMallOrderService adminMallOrderService;
/**
- * 商品列表
+ * 订单列表
* @param mallOrderInfo
* @param request
* @return
@@ -38,6 +42,27 @@
return new FebsResponse().success().data(data);
}
+ /**
+ * 订单列表-发货
+ */
+ @PostMapping("deliverGoods")
+ @ControllerEndpoint(operation = "订单列表-发货", exceptionMessage = "操作失败")
+ public FebsResponse deliverGoods(@Valid DeliverGoodsDto deliverGoodsDto) {
+ 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);
+ }
+
--
Gitblit v1.9.1