diff --git a/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml b/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
index e5cbcc3..2301d98 100644
--- a/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
+++ b/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
@@ -91,1046 +91,1046 @@ performance_schema|schema||mysql.session|localhost|SELECT|G
sys|schema||mysql.sys|localhost|TRIGGER|G
8.0.28
-
- armscii8
-
-
+
armscii8
1
-
- ascii
+
+ armscii8
-
+
ascii
1
-
- big5
+
+ ascii
-
+
big5
1
+
+ big5
+
binary
1
-
- cp1250
-
-
- cp1250
-
-
- cp1250
-
-
+
cp1250
1
+
+ cp1250
+
+
+ cp1250
+
+
+ cp1250
+
cp1250
-
+
cp1251
-
+
cp1251
-
+
+ cp1251
+
+
cp1251
1
-
+
cp1251
-
- cp1251
-
-
- cp1256
-
-
+
cp1256
1
-
+
+ cp1256
+
+
cp1257
-
+
+ cp1257
+
+
cp1257
1
-
- cp1257
-
-
- cp850
-
-
+
cp850
1
-
- cp852
+
+ cp850
-
+
cp852
1
-
- cp866
+
+ cp852
-
+
cp866
1
-
- cp932
+
+ cp866
-
+
cp932
1
-
- dec8
+
+ cp932
-
+
dec8
1
-
- eucjpms
+
+ dec8
-
+
eucjpms
1
-
- euckr
+
+ eucjpms
-
+
euckr
1
-
- gb18030
+
+ euckr
-
+
gb18030
1
+
+ gb18030
+
gb18030
-
- gb2312
-
-
+
gb2312
1
-
- gbk
+
+ gb2312
-
+
gbk
1
-
- geostd8
+
+ gbk
-
+
geostd8
1
-
- greek
+
+ geostd8
-
+
greek
1
-
- hebrew
+
+ greek
-
+
hebrew
1
-
- hp8
+
+ hebrew
-
+
hp8
1
-
- keybcs2
+
+ hp8
-
+
keybcs2
1
-
- koi8r
+
+ keybcs2
-
+
koi8r
1
-
- koi8u
+
+ koi8r
-
+
koi8u
1
-
+
+ koi8u
+
+
latin1
-
- latin1
-
-
- latin1
-
-
- latin1
-
-
- latin1
-
-
- latin1
-
-
- latin1
-
-
+
latin1
1
-
+
+ latin1
+
+
+ latin1
+
+
+ latin1
+
+
+ latin1
+
+
+ latin1
+
+
+ latin1
+
+
latin2
-
- latin2
-
-
- latin2
-
-
+
latin2
1
-
+
latin2
-
- latin5
+
+ latin2
-
+
+ latin2
+
+
latin5
1
-
+
+ latin5
+
+
latin7
-
- latin7
-
-
+
latin7
1
-
+
latin7
-
- macce
+
+ latin7
-
+
macce
1
-
- macroman
+
+ macce
-
+
macroman
1
-
- sjis
+
+ macroman
-
+
sjis
1
-
- swe7
+
+ sjis
-
+
swe7
1
-
- tis620
+
+ swe7
-
+
tis620
1
-
- ucs2
+
+ tis620
-
- ucs2
-
-
- ucs2
-
-
- ucs2
-
-
- ucs2
-
-
- ucs2
-
-
+
ucs2
1
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
ucs2
-
+
+ ucs2
+
+
+ ucs2
+
+
+ ucs2
+
+
+ ucs2
+
+
+ ucs2
+
+
+ ucs2
+
+
ucs2
ucs2
-
+
ucs2
-
+
ucs2
-
- ujis
-
-
+
ujis
1
-
- utf16
+
+ ujis
-
- utf16
-
-
- utf16
-
-
- utf16
-
-
- utf16
-
-
- utf16
-
-
+
utf16
1
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
utf16
-
+
+ utf16
+
+
+ utf16
+
+
+ utf16
+
+
+ utf16
+
+
+ utf16
+
+
+ utf16
+
+
utf16
utf16
-
- utf16le
-
-
+
utf16le
1
-
- utf32
+
+ utf16le
-
- utf32
-
-
- utf32
-
-
- utf32
-
-
- utf32
-
-
- utf32
-
-
+
utf32
1
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
utf32
-
+
+ utf32
+
+
+ utf32
+
+
+ utf32
+
+
+ utf32
+
+
+ utf32
+
+
+ utf32
+
+
utf32
utf32
-
- utf8
-
-
- utf8
-
-
- utf8
-
-
- utf8
-
-
- utf8
-
-
- utf8
-
-
+
utf8
1
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
utf8
-
+
+ utf8
+
+
+ utf8
+
+
+ utf8
+
+
+ utf8
+
+
+ utf8
+
+
+ utf8
+
+
utf8
utf8
-
+
utf8
-
+
utf8
-
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
+ utf8mb4
+
+
utf8mb4
1
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
+
utf8mb4
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
- utf8mb4
-
-
+
+ utf8mb4_0900_ai_ci
+
+
+ utf8_general_ci
+
+
+ utf8mb4_0900_ai_ci
+
+
+ utf8mb4_0900_ai_ci
+
+
+ utf8mb4_0900_ai_ci
+
+
1
2023-12-16.23:57:15
2023-12-16.07:57:14
utf8_general_ci
-
- utf8mb4_0900_ai_ci
-
-
- utf8_general_ci
-
-
- utf8mb4_0900_ai_ci
-
-
- utf8mb4_0900_ai_ci
-
-
- utf8mb4_0900_ai_ci
-
caching_sha2_password
-
+
+ caching_sha2_password
+
+
0
localhost
caching_sha2_password
-
+
0
localhost
caching_sha2_password
-
+
0
localhost
caching_sha2_password
-
- caching_sha2_password
-
-
+
分类品牌
InnoDB
utf8mb4_0900_ai_ci
-
+
商品分类
InnoDB
utf8mb4_0900_ai_ci
-
+
分类品牌
InnoDB
utf8mb4_0900_ai_ci
-
+
优惠券信息
InnoDB
utf8_general_ci
-
+
优惠券范围表
InnoDB
utf8_general_ci
-
+
优惠券领用表
InnoDB
utf8_general_ci
-
+
订单
InnoDB
utf8_general_ci
-
+
订单项信息
InnoDB
utf8_general_ci
-
+
订单操作日志记录
InnoDB
utf8_general_ci
-
+
订单统计
InnoDB
utf8_general_ci
-
+
付款信息表
InnoDB
utf8mb4_0900_ai_ci
-
+
商品
InnoDB
utf8mb4_0900_ai_ci
-
+
商品属性表
InnoDB
utf8mb4_0900_ai_ci
-
+
商品sku属性表
InnoDB
utf8mb4_0900_ai_ci
-
+
商品sku
InnoDB
utf8mb4_0900_ai_ci
-
+
商品规格
InnoDB
utf8mb4_0900_ai_ci
-
+
商品单位
InnoDB
utf8mb4_0900_ai_ci
-
+
地区信息表
InnoDB
utf8mb4_0900_ai_ci
-
+
系统用户登录记录
InnoDB
utf8_general_ci
-
+
菜单表
InnoDB
utf8mb4_0900_ai_ci
-
+
操作日志记录
InnoDB
utf8_general_ci
-
+
角色
InnoDB
utf8_general_ci
-
+
角色菜单
InnoDB
utf8_general_ci
-
+
用户表
InnoDB
utf8mb4_0900_ai_ci
-
+
用户角色
InnoDB
utf8_general_ci
-
+
用户地址表
InnoDB
utf8mb4_0900_ai_ci
-
+
用户浏览记录表
InnoDB
utf8mb4_0900_ai_ci
-
+
用户收藏表
InnoDB
utf8mb4_0900_ai_ci
-
+
会员表
InnoDB
utf8mb4_0900_ai_ci
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index a147371..5afb336 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -4,6 +4,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f65d4c6..a7c58c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,15 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -20,9 +22,9 @@
@@ -111,7 +113,7 @@
1702710124940
-
+
@@ -137,7 +139,15 @@
1702731251043
-
+
+
+ 1702735339646
+
+
+
+ 1702735339646
+
+
@@ -147,7 +157,8 @@
-
+
+
diff --git a/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java b/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java
new file mode 100644
index 0000000..d6fee27
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java
@@ -0,0 +1,29 @@
+package cn.bunny.controller;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.vo.common.Result;
+import cn.bunny.common.spzx.model.vo.common.ResultCodeEnum;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+import cn.bunny.service.OrderInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "统计查询")
+@RestController
+@RequestMapping("/admin/order/orderInfo")
+public class OrderInfoController {
+ @Autowired
+ private OrderInfoService orderInfoService;
+
+ @Operation(summary = "统计查询", description = "统计查询")
+ @GetMapping("getOrderStatisticsData")
+ public Result getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto) {
+ OrderStatisticsVo orderStatisticsVo = orderInfoService.getOrderStatisticsData(orderStatisticsDto);
+
+ return Result.build(orderStatisticsVo, ResultCodeEnum.SUCCESS);
+ }
+}
diff --git a/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java b/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
index 2bcbed4..e2b48b9 100644
--- a/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
+++ b/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
@@ -1,10 +1,16 @@
package cn.bunny.mapper;
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
import cn.bunny.common.spzx.model.entity.order.OrderStatistics;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface OrderStatisticsMapper {
// 将统计结果保存到数据库
void insert(OrderStatistics orderStatistics);
+
+ // 统计查询
+ List selectList(OrderStatisticsDto orderStatisticsDto);
}
diff --git a/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java b/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java
new file mode 100644
index 0000000..c6a4ef0
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java
@@ -0,0 +1,9 @@
+package cn.bunny.service;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+
+public interface OrderInfoService {
+ // 统计查询
+ OrderStatisticsVo getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto);
+}
diff --git a/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java b/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java
new file mode 100644
index 0000000..bf017f6
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java
@@ -0,0 +1,37 @@
+package cn.bunny.service.impl;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.entity.order.OrderStatistics;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+import cn.bunny.mapper.OrderStatisticsMapper;
+import cn.bunny.service.OrderInfoService;
+import cn.hutool.core.date.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service
+public class OrderInfoServiceImpl implements OrderInfoService {
+ @Autowired
+ private OrderStatisticsMapper orderStatisticsMapper;
+
+ // 统计查询
+ @Override
+ public OrderStatisticsVo getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto) {
+ List orderStatisticsList = orderStatisticsMapper.selectList(orderStatisticsDto);
+
+ List dateList = orderStatisticsList.stream().map(OrderStatistics -> DateUtil.format(OrderStatistics.getOrderDate(), "yyyy-MM-dd")).toList();
+ List decimalList = orderStatisticsList.stream().map(OrderStatistics::getTotalAmount).toList();
+
+ OrderStatisticsVo orderStatisticsVo = new OrderStatisticsVo();
+ orderStatisticsVo.setDateList(dateList);
+ orderStatisticsVo.setAmountList(decimalList);
+
+ return orderStatisticsVo;
+ }
+}
diff --git a/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml b/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
index 1bc11cc..ee06f09 100644
--- a/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
+++ b/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
@@ -18,4 +18,19 @@
#{totalAmount},
#{totalNum})
+
+
+
diff --git a/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java b/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
index ed7efeb..9987ef4 100644
--- a/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
+++ b/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
@@ -5,7 +5,7 @@ import lombok.Data;
@Data
@Schema(description = "搜索条件实体类")
-public class OrderStatisticsDto {
+public class OrderStatisticsDto {
@Schema(description = "开始时间")
private String createTimeBegin;
@Schema(description = "结束时间")