From a5a508edf6868bb6c91ac98d21e80459ab7ec1c0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 16:00:57 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 7ed29f9..18f99d0 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -62,6 +62,21 @@
private final MallMemberMapper mallMemberMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+
+ /**
+ * 订单多次退款审核
+ *
+ * @param mallRefundEntity
+ * @param request
+ * @return
+ */
+ @GetMapping("orderRefundList")
+ public FebsResponse orderRefundList(MallRefundEntity mallRefundEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallOrderService.getOrderRefundListInPage(mallRefundEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
/**
* 订单列表
*
@@ -321,7 +336,7 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.sub(StrUtil.isEmpty(productNames)?"商品":productNames,0,10)+"...");
+ orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
orderStateDto.setOrderState("已送达");
orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
--
Gitblit v1.9.1