From ba32f46c25970837ff33ac9fd81daf573884352e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 25 Dec 2023 17:18:53 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 13 +++++++++++--
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 1 +
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 25 +++++++++++++++----------
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 2c5b255..3986eb0 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -5,6 +5,7 @@
@Getter
public enum DataDictionaryEnum {
+ IDS_GOODS_STATISTICS("IDS_GOODS_STATISTICS", "IDS_GOODS_STATISTICS"),
/**
* 微信设置
*/
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);
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index 6a55b29..cac16e5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -2,8 +2,11 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallOrderRefundMapper;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.vo.*;
@@ -23,6 +26,7 @@
private final IAdminMallOrderService adminMallOrderService;
private final MallOrderRefundMapper mallOrderRefundMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
public static long idFromMember;
@@ -219,11 +223,16 @@
* 订单列表-统计商品份数
* @return
*/
- public static String orderIdsStr;
+// public static String orderIdsStr;
@GetMapping("/goodsStatistics/{statistics}")
@RequiresPermissions("goodsStatistics:update")
public String goodsStatistics(@PathVariable String statistics, Model model) {
- orderIdsStr = statistics;
+ dataDictionaryCustomMapper.updateDicValueByTypeAndCode(
+ DataDictionaryEnum.IDS_GOODS_STATISTICS.getType(),
+ DataDictionaryEnum.IDS_GOODS_STATISTICS.getCode(),
+ statistics
+ );
+// orderIdsStr = statistics;
return FebsUtil.view("modules/order/goodsStatistics");
}
--
Gitblit v1.9.1