From c19dc78c41273727339aeea025b3c75c09454c5a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 11:44:56 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 ac9a274..775792f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -44,10 +44,7 @@
import javax.validation.constraints.NotNull;
import java.io.*;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@Validated
@@ -613,13 +610,21 @@
*/
@GetMapping("goodsStatistics")
public FebsResponse goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request, Integer parentId) {
- if (parentId == null) {
- ViewMallOrderController.orderIdsStr = "";
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.IDS_GOODS_STATISTICS.getType(),
+ DataDictionaryEnum.IDS_GOODS_STATISTICS.getCode()
+ );
+ if (ObjectUtil.isNotEmpty(dataDictionaryCustom)) {
+ long[] longs = StrUtil.splitToLong(dataDictionaryCustom.getValue(), ',');
+ mallOrderItem.setOrderIdsStr(longs);
+ Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
+ return new FebsResponse().success().data(data);
+ }else{
+ Map<String, Object> data = new HashMap<>(0);
+ data.put("rows", null);
+ data.put("total", 0);
+ return new FebsResponse().success().data(data);
}
- long[] longs = StrUtil.splitToLong(ViewMallOrderController.orderIdsStr, ',');
- mallOrderItem.setOrderIdsStr(longs);
- Map<String, Object> data = getDataTable(adminMallOrderService.goodsStatistics(mallOrderItem,request));
- return new FebsResponse().success().data(data);
}
}
--
Gitblit v1.9.1