富文本框输入版本变化

KKSU

2023-12-25 ba32f46c25970837ff33ac9fd81daf573884352e

 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 = "";
        }
        long[] longs = StrUtil.splitToLong(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);
        }
    }

}