hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 16:35:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

Browse Source 
# Conflicts:
#	sql/mysql/statistics.sql
This commit is contained in:
owen
2023-10-17 16:13:46 +08:00
parent 5e65512a92 d842708c23
commit b1e0129046
25 changed files with 263 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/MemberStatisticsController.java
View File

@ -100,6 +100,8 @@ public class MemberStatisticsController {
return success(memberStatisticsService.getMemberTerminalStatisticsList());
}
// TODO 芋艿：已经 review
// TODO @疯狂：要注意 date 的排序；
@GetMapping("/user-count-comparison")
@Operation(summary = "获得用户数量对照")
@PreAuthorize("@ss.hasPermission('statistics:member:query')")

1
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
View File

@ -130,6 +130,7 @@ public class TradeStatisticsController {
@Operation(summary = "获得订单量趋势统计")
@PreAuthorize("@ss.hasPermission('statistics:trade:query')")
public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
// TODO @疯狂：要注意 date 的排序；
return success(tradeOrderStatisticsService.getOrderCountTrendComparison(reqVO));
}